[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_5 updated. d31f13efa5ae244f4a0aaf520d06cb9edd1c738b

[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_5 has been updated
       via  d31f13efa5ae244f4a0aaf520d06cb9edd1c738b (commit)
       via  8c660f9483e3b9285e8178816460530d4b355845 (commit)
      from  bc0a3bed1fcca684d96a925547b962d597cdc692 (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 d31f13efa5ae244f4a0aaf520d06cb9edd1c738b
Author: Mike Rylander <mrylander at gmail.com>
Date:   Fri Feb 7 16:00:01 2014 -0500

    Include calculated 0-prox locations in the stalling interval for op capture
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index acfd245..912996d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -548,7 +548,7 @@ sub nearest_hold {
                 ON ( csp.id = ausp.standing_penalty AND csp.block_list LIKE '%CAPTURE%' )
             $addl_join
           WHERE hm.target_copy = ?
-            AND (AGE(NOW(),h.request_time) >= CAST(? AS INTERVAL) OR p.prox = 0)
+            AND (AGE(NOW(),h.request_time) >= CAST(? AS INTERVAL) OR hm.proximity = 0 OR p.prox = 0)
             AND h.capture_time IS NULL
             AND h.cancel_time IS NULL
             AND (h.expire_time IS NULL OR h.expire_time > NOW())

commit 8c660f9483e3b9285e8178816460530d4b355845
Author: Mike Rylander <mrylander at gmail.com>
Date:   Tue Jan 21 12:31:13 2014 -0500

    Use copy owning library as the context for finding best hold sort order setting
    
    In the olden days before best hold sort order and proximity adjustment, there was
    no need to consider any context org other than "here", because the choices were,
    essentially, FIFO or Traditional applied within the hard-boundary range.  However,
    now we need to decided whose rule to follow, and the most correct arbiter of that
    is the owning library of the call number of the copy.  We avoid copy circ lib
    because that can change with floating copies.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 9692f27..acfd245 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -515,8 +515,15 @@ sub nearest_hold {
         $cp_circ_lib = $cp->circ_lib;
     }
 
+    my $cp_owning_lib;
+    if (ref $cp->call_number->owning_lib) {
+        $cp_owning_lib = $cp->call_number->owning_lib->id;
+    } else {
+        $cp_owning_lib = $cp->call_number->owning_lib;
+    }
+
     my ($holdsort, $addl_cte, $addl_join) =
-        build_hold_sort_clause(get_hold_sort_order($here), $cp, $here);
+        build_hold_sort_clause(get_hold_sort_order($cp_owning_lib), $cp, $here);
 
     local $OpenILS::Application::Storage::WRITE = 1;
 

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

Summary of changes:
 .../Application/Storage/Publisher/action.pm        |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS