[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 2cd6ebfb6d173fbe43f8902e54086c9e58fd1813

[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_2 has been updated
       via  2cd6ebfb6d173fbe43f8902e54086c9e58fd1813 (commit)
      from  5f62d8b337f0e6937967b10a8926377ad1a8c52a (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 2cd6ebfb6d173fbe43f8902e54086c9e58fd1813
Author: Steven Callender <stevecallender at esilibrary.com>
Date:   Tue Jul 10 15:43:59 2012 -0400

    Changed the thawing of a hold to first update the hold record and then re-target.
    
    When thawing a hold, originaly we were first re-targeting before actually saving the hold record. On items with large quantities, sometimes the hold would timeout on targetig before getting a chance to actually save. This patch moves things around to first save the hold record before attempting to retarget.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    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 431a17e..3b46e8c 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -998,10 +998,20 @@ sub update_hold_impl {
         }
     } 
 
-    update_hold_if_frozen($self, $e, $hold, $orig_hold);
+    if($U->is_true($hold->frozen)) {
+        $logger->info("clearing current_copy and check_time for frozen hold ".$hold->id);
+        $hold->clear_current_copy;
+        $hold->clear_prev_check_time;
+    }
+
     $e->update_action_hold_request($hold) or return $e->die_event;
     $e->commit;
 
+    if(!$U->is_true($hold->frozen) && $U->is_true($orig_hold->frozen)) {
+        $logger->info("Running targeter on activated hold ".$hold->id);
+        $U->storagereq( 'open-ils.storage.action.hold_request.copy_targeter', undef, $hold->id );
+    }
+
     # a change to mint-condition changes the set of potential copies, so retarget the hold;
     if($U->is_true($hold->mint_condition) and !$U->is_true($orig_hold->mint_condition)) {
         _reset_hold($self, $e->requestor, $hold) 

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

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


hooks/post-receive
-- 
Evergreen ILS