[open-ils-commits] [GIT] Evergreen ILS branch master updated. aa3bed55568243127e2e54ff7b25f8226d6897bb

[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, master has been updated
       via  aa3bed55568243127e2e54ff7b25f8226d6897bb (commit)
       via  d0399c9af3612e8fbe761cc3e2ab118c8aa43ffb (commit)
       via  1e3e3e79ab7b5dcf62562b68f6ae398e37d96c88 (commit)
      from  b0691c4d4c3754b2960b5f328d3b7b2ff6a63adf (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 aa3bed55568243127e2e54ff7b25f8226d6897bb
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Mar 17 09:19:18 2014 -0400

    LP#1279998 marc stream importer release notes
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt b/docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt
new file mode 100644
index 0000000..2acff93
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt
@@ -0,0 +1,19 @@
+MARC Stream Importer
+^^^^^^^^^^^^^^^^^^^^
+
+New command line options were added to marc_stream_importer.pl for
+passing additional Vandelay import flags.  Prior to this change, only
+auto-overlay-exact was supported.  
+
+New options:
+
+  * --auto-overlay-exact
+    ** Overlay/merge on exact 901c matches
+  * --auto-overlay-1match
+    ** Overlay/merge when exactly one match is found
+  * --auto-overlay-best-match
+    ** Overlay/merge on best match
+  * --import-no-match
+    ** Import when no match is found
+
+Like Vandelay, these options can be combined.

commit d0399c9af3612e8fbe761cc3e2ab118c8aa43ffb
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Feb 14 12:40:00 2014 -0500

    LP#1279998 marc_stream_importer option no-match import; delete repairs
    
    * Adds another command line option for --import-no-match, so that
      importing non-matching records is now optional.
    
    * Improve vandelay response reporting to ensure that all imported
      records get cleaned up.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/support-scripts/marc_stream_importer.pl b/Open-ILS/src/support-scripts/marc_stream_importer.pl
index bdb740b..e0a2aa3 100755
--- a/Open-ILS/src/support-scripts/marc_stream_importer.pl
+++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl
@@ -55,6 +55,7 @@ my %defaults = (
     'nodaemon'      => 0,
     'wait=i'        => 5,
     'import-by-queue' => 0,
+    'import-no-match' => 0,
     'auto-overlay-exact' => 0,
     'auto-overlay-1match' => 0,
     'auto-overlay-best-match' => 0
@@ -253,8 +254,9 @@ sub process_spool { # filename
 
 sub bib_queue_import {
     my $rec_ids = shift;
-    my $extra = {import_no_match => 1};
+    my $extra = {report_all => 1};
     $extra->{merge_profile} = $merge_profile if $merge_profile;
+    $extra->{import_no_match} = 1 if $real_opts->{'import-no-match'};
     $extra->{auto_overlay_1match} = 1 if $real_opts->{'auto-overlay-1match'};
     $extra->{auto_overlay_best_match} = 1 if $real_opts->{'auto-overlay-best-match'};
 

commit 1e3e3e79ab7b5dcf62562b68f6ae398e37d96c88
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Feb 12 10:18:39 2014 -0500

    LP#1279998 marc_stream_importer support alternate match strategies
    
    Adds support for sending auto-overlay-1match and auto-overlay-best-match
    in addition to auto-overlay-exact to Vandelay when performing the
    import.  If no strategy is chosen, the script still defaults to
    auto-overlay-exact.
    
    These changes are managed with 3 new command line options:
    
    --auto-overlay-exact
    --auto-overlay-1match
    --auto-overlay-best-match
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/support-scripts/marc_stream_importer.pl b/Open-ILS/src/support-scripts/marc_stream_importer.pl
index d288504..bdb740b 100755
--- a/Open-ILS/src/support-scripts/marc_stream_importer.pl
+++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl
@@ -54,7 +54,10 @@ my %defaults = (
     'noqueue'       => 0,
     'nodaemon'      => 0,
     'wait=i'        => 5,
-    'import-by-queue' => 0
+    'import-by-queue' => 0,
+    'auto-overlay-exact' => 0,
+    'auto-overlay-1match' => 0,
+    'auto-overlay-best-match' => 0
 );
 
 $OpenILS::Utils::Cronscript::debug=1 if $debug;
@@ -250,11 +253,15 @@ sub process_spool { # filename
 
 sub bib_queue_import {
     my $rec_ids = shift;
-    my $extra = {
-        auto_overlay_exact => 1,
-        import_no_match    => 1,
-    };
+    my $extra = {import_no_match => 1};
     $extra->{merge_profile} = $merge_profile if $merge_profile;
+    $extra->{auto_overlay_1match} = 1 if $real_opts->{'auto-overlay-1match'};
+    $extra->{auto_overlay_best_match} = 1 if $real_opts->{'auto-overlay-best-match'};
+
+    # default to exact match if no strategy is chosen
+    $extra->{auto_overlay_exact} = 1 
+        if $real_opts->{'auto-overlay-exact'} or
+        not ($extra->{auto_overlay_1match} or $extra->{auto_overlay_best_match});
 
     my $req;
     my @cleanup_recs;

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

Summary of changes:
 .../src/support-scripts/marc_stream_importer.pl    |   19 ++++++++++++++-----
 .../Cataloging/marc_stream_importer.txt            |   19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/marc_stream_importer.txt


hooks/post-receive
-- 
Evergreen ILS