[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. c980529a092609af40235f28b55390f4e1ffa415

[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_10 has been updated
       via  c980529a092609af40235f28b55390f4e1ffa415 (commit)
       via  7b7759c6b9746888e33086e632e839f7b9021779 (commit)
      from  d8fb80ae4a6911e3ac596730d9fb06572f4f021d (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 c980529a092609af40235f28b55390f4e1ffa415
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue May 24 13:27:05 2016 -0400

    LP#1580676: fix error message
    
    This patch fixes a typo in the error message presented
    if the queued record could not be cleaned up for some
    reason; it also reports the correct type of the record.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/support-scripts/marc_stream_importer.pl b/Open-ILS/src/support-scripts/marc_stream_importer.pl
index 29d5e85..670e8c7 100755
--- a/Open-ILS/src/support-scripts/marc_stream_importer.pl
+++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl
@@ -380,7 +380,7 @@ sub import_queued_records {
         };
 
         if ($@) {
-            $logger->error("Error deleteing queued bib record $_: $@");
+            $logger->error("Error deleting queued $cur_rec_type record $_: $@");
             last;
         }
     }

commit 7b7759c6b9746888e33086e632e839f7b9021779
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed May 11 12:19:12 2016 -0400

    LP#1580676 MARC stream authority cleanup repair
    
    Delete the successfully imported authority record from the vandelay
    authority queue instead of the bib record that happens to have the same
    ID as the imported authority record.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/support-scripts/marc_stream_importer.pl b/Open-ILS/src/support-scripts/marc_stream_importer.pl
index f51e0ff..29d5e85 100755
--- a/Open-ILS/src/support-scripts/marc_stream_importer.pl
+++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl
@@ -371,10 +371,12 @@ sub import_queued_records {
     $pcrud->request('open-ils.pcrud.transaction.begin', $authtoken)->recv;
     my $err;
 
+    my $api = 'open-ils.pcrud.delete.';
+    $api .= $cur_rec_type eq 'auth' ? 'vqar' : 'vqbr';
+
     foreach (@cleanup_recs) {
         eval {
-            $pcrud->request(
-                'open-ils.pcrud.delete.vqbr', $authtoken, $_)->recv;
+            $pcrud->request($api, $authtoken, $_)->recv;
         };
 
         if ($@) {

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

Summary of changes:
 .../src/support-scripts/marc_stream_importer.pl    |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS