From da521bed5758a5ee7d6f15e25dc7d3c00546071a Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 27 Dec 2011 15:55:33 -0500 Subject: [PATCH] Hold current_shelf_lib for shelf browse API Use the new current_shelf_lib column on hold requests to determine which copies are on a given shelf. This also removes the shelf_time filter since shelf_time is guaranteed to be set if current_shelf_lib is set. Signed-off-by: Bill Erickson --- .../src/perlmods/lib/OpenILS/Application/Circ/Holds.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 d35e13d5ac..b69b7f5794 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm @@ -1945,14 +1945,11 @@ sub fetch_captured_holds { capture_time => { "!=" => undef }, current_copy => { "!=" => undef }, fulfillment_time => undef, - pickup_lib => $org, -# cancel_time => undef, - } + current_shelf_lib => $org + } } }; if($self->api_name =~ /expired/) { -# $query->{'where'}->{'+ahr'}->{'shelf_expire_time'} = {'<' => 'now'}; - $query->{'where'}->{'+alhr'}->{'shelf_time'} = {'!=' => undef}; $query->{'where'}->{'+alhr'}->{'-or'} = { shelf_expire_time => { '<' => 'now'}, cancel_time => { '!=' => undef }, -- 2.43.2