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

[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  5a1ef757c880e931e88cf09c1c6e1234a524206e (commit)
      from  09873f3feaa4a861716bf0470172c29d3783da8d (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 5a1ef757c880e931e88cf09c1c6e1234a524206e
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Thu Mar 28 15:08:37 2013 -0400

    Fix bug in hold targeter introduced with Calculated Proximity Adjustments
    
    The Calculated Proximity Adjustments feature introduced a bug in the
    hold targeter where holds would not discount those copies from the
    potentials list that aren't in either the Available or Reshelving
    status.
    
    This commit should restore the earlier, correct behavior.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

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 abe4c46..9e09d19 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
@@ -1578,8 +1578,13 @@ sub new_hold_copy_targeter {
 			}
 
 			# reset prox list after trimming good copies
-			$prox_list = create_prox_list( $self, $pu_lib, \@good_copies, $hold );
+			$prox_list = create_prox_list(
+				$self, $pu_lib,
+				[ grep { ''.$_->circ_lib eq $pu_lib && ( $_->status == 0 || $_->status == 7 ) } @good_copies ],
+				$hold
+			);
 
+			$all_copies = [ grep { ''.$_->circ_lib ne $pu_lib && ( $_->status == 0 || $_->status == 7 ) } @good_copies ];
 
 			my $min_prox = [ sort keys %$prox_list ]->[0];
 			my $best;
@@ -1589,11 +1594,6 @@ sub new_hold_copy_targeter {
 				$best = choose_nearest_copy($hold, { $min_prox => delete($$prox_list{$min_prox}) });
 			}
 
-			$all_copies = [];
-			for my $prox (keys %$prox_list) {
-				push @$all_copies, @{$$prox_list{$prox}};
-			}
-	
 			$client->status( new OpenSRF::DomainObject::oilsContinueStatus );
 
 			if (!$best) {

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

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


hooks/post-receive
-- 
Evergreen ILS