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

[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  f2a40ab35ce77f41eda6a7101026dadd5e8e4380 (commit)
       via  0ef3b5890df1afb2e533f8c0af60b04389c52d0c (commit)
      from  56fa348c351da2e4d1a9af9903c91a4b7ab8f33b (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 f2a40ab35ce77f41eda6a7101026dadd5e8e4380
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Mon Jan 30 10:09:17 2012 -0500

    Fix "Clear Shelf Expired Holds" checkin modifier
    
    By not looking up empty arrays there either.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index fe1b930..17ae306 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -3445,7 +3445,8 @@ sub clear_shelf_process {
         # refetch the holds to pick up the caclulated cancel_time, 
         # which may be needed by Action/Trigger
         $e->xact_begin;
-        my $updated_holds = $e->search_action_hold_request({id => \@canceled_holds}, {substream => 1});
+        my $updated_holds = [];
+        $updated_holds = $e->search_action_hold_request({id => \@canceled_holds}, {substream => 1}) if (@canceled_holds > 0);
         $e->rollback;
 
         $U->create_events_for_hook(

commit 0ef3b5890df1afb2e533f8c0af60b04389c52d0c
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Mon Jan 30 08:52:37 2012 -0500

    Fix SIP2 "unavailable holds" check
    
    If no IDs, don't look up an empty array of IDs.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 519382f..832c827 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -639,13 +639,14 @@ sub unavail_holds {
         }
     });
  
-     my @holds_sip_output = map {
+     my @holds_sip_output;
+     @holds_sip_output = map {
         OpenILS::SIP::clean_text($self->__hold_to_title($_))
      } @{
         $self->{editor}->search_action_hold_request(
             {id => [map {$_->{id}} @$ids]}
         )
-     };
+     } if (@$ids > 0);
  
      return (defined $start and defined $end) ?
          [ @holds_sip_output[($start-1)..($end-1)] ] :

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    3 ++-
 Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm    |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS