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

[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  bb6451c5644167a42de43a4106d93199232bb1af (commit)
       via  2d4ae0fe29d4170c7f8c021df58bc3a64bebe317 (commit)
      from  fde1da34e60cd2affad35c2622675709e11538eb (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 bb6451c5644167a42de43a4106d93199232bb1af
Merge: fde1da3 2d4ae0f
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Oct 11 09:52:06 2011 -0400

    Merge remote branch 'working/user/berick/marc-stream-importer-read-repair'
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>


commit 2d4ae0fe29d4170c7f8c021df58bc3a64bebe317
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Sep 27 16:14:59 2011 -0400

    Read STDIN up to record separator then stop
    
    The initial (and only known) target for the importer is OCLC Connexion
    exports, which export 1 record at a time, with each record ending with
    the standard record separator.  There is no end-of-file /
    end-of-transmission indicator, so the while() loop always blocks and
    fails on the timeout alarm after the first record is read.
    
    Until a more flexible solution is in place, roll back support for
    reading multiple records via STDIN.  The original commit was
    
    679506975f0efb6e2f6f17b0c19e3c53c5bfda44
    
    Note, the feature being rolled back was not actually necessary to
    implement the feature in the commit (file-based imports).  It was just
    an added bonus.
    
    Signed-off-by: Bill Erickson <berick 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 2549222..d288504 100755
--- a/Open-ILS/src/support-scripts/marc_stream_importer.pl
+++ b/Open-ILS/src/support-scripts/marc_stream_importer.pl
@@ -380,10 +380,7 @@ sub process_request {   # The core Net::Server method
         local $SIG{ALRM} = sub { die "alarm\n" };
         alarm $wait_time; # prevent accidental tie ups of backend processes
         local $/ = "\x1D"; # MARC record separator
-        while (my $newline = <STDIN>) {
-            $data .= $newline;
-            alarm $wait_time; # prevent accidental tie ups of backend processes
-        }
+        $data = <STDIN>;
         alarm 0;
     };
 

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

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


hooks/post-receive
-- 
Evergreen ILS