Exports are broken

Proposed fix for lp1175816, tested with 2.3.2 / 2.4.0.

Signed-off-by: Mark Cooper <markchristophercooper@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
index 373effd..b9fea03 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
@@ -219,9 +219,9 @@ sub handler {
                        if ($holdings) {
                                $req->delete_field( $_ ) for ($req->field('852')); # remove any legacy 852s
 
-                               my $cn_list = [ grep { $_->deleted eq 'f' } @{ $bib->call_numbers } ];
+                               my $cn_list = $bib->call_numbers;
                                if ($cn_list && @$cn_list) {
-
+                                                       $cn_list = [ grep { $_->deleted eq 'f' } @$cn_list ];
                                        my $cp_list = [ grep { $_->deleted eq 'f' } map { @{ $_->copies } } @$cn_list ];
                                        if ($cp_list && @$cp_list) {
 

diff --git a/Open-ILS/src/support-scripts/marc_export.in b/Open-ILS/src/support-scripts/marc_export.in
index 709c613..3de8397 100755 (executable)
--- a/Open-ILS/src/support-scripts/marc_export.in
+++ b/Open-ILS/src/support-scripts/marc_export.in
@@ -383,9 +383,9 @@ sub add_bib_holdings {
     my $bib = shift;
     my $r = shift;
 
-    my $cn_list = [ grep { $_->deleted eq 'f' } @{ $bib->call_numbers } ];
+    my $cn_list = $bib->call_numbers;
     if ($cn_list && @$cn_list) {
-
+        $cn_list = [ grep { $_->deleted eq 'f' } @$cn_list ];
         $count{cn} += @$cn_list;
 
         my $cp_list = [ grep { $_->deleted eq 'f' } map { @{ $_->copies } } @$cn_list ];