[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. f3e1020b4b44094e9784b8282b5e44db4727d828

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_4 has been updated
       via  f3e1020b4b44094e9784b8282b5e44db4727d828 (commit)
      from  336f1831e2e169c57f9b01521a1b1dec8c18b034 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f3e1020b4b44094e9784b8282b5e44db4727d828
Author: Mark Cooper <markchristophercooper at gmail.com>
Date:   Mon May 6 12:37:32 2013 -0700

    Exports are broken
    
    Proposed fix for lp1175816, tested with 2.3.2 / 2.4.0.
    
    Signed-off-by: Mark Cooper <markchristophercooper at gmail.com>
    Signed-off-by: Galen Charlton <gmc at 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
--- 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
--- 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 ];

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm |    4 ++--
 Open-ILS/src/support-scripts/marc_export.in       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS