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

[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  5f648064b80c6f6e08174650a0dcb886e4d2f7a1 (commit)
      from  922bdf45201a7347fbbdcca2611e82b5cf77bf33 (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 5f648064b80c6f6e08174650a0dcb886e4d2f7a1
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Feb 5 16:52:36 2015 +0000

    LP#904581: when calculating hold status, be more careful about fetching transits
    
    This patch fixes a problem where if a hold meets the following
    criteria, an "Invalid date format: at /usr/share/perl5/Error.pm"
    error can be thrown when fetching its details:
    
    - the hold has a captured item
    - the captured item has status 8 (on hold shelf)
    - there is another item that is currently in transit to fill the hold
    - the pickup library (or one of its ancestors) has the
      circ.hold_shelf_status_delay library setting set.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

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 1ec6066..a5f9e7e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1283,7 +1283,11 @@ sub _hold_status {
         # the interval is greater than now, consider the hold to be in the virtual
         # "on its way to the holds shelf" status. Return 5.
 
-        my $transit    = $e->search_action_hold_transit_copy({hold => $hold->id})->[0];
+        my $transit    = $e->search_action_hold_transit_copy({
+                            hold           => $hold->id,
+                            target_copy    => $copy->id,
+                            dest_recv_time => {'!=' => undef},
+                         })->[0];
         my $start_time = ($transit) ? $transit->dest_recv_time : $hold->capture_time;
         $start_time    = DateTime::Format::ISO8601->new->parse_datetime(cleanse_ISO8601($start_time));
         my $end_time   = $start_time->add(seconds => OpenSRF::Utils::interval_to_seconds($hs_wait_interval));

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS