From: Bill Erickson Date: Fri, 5 Jun 2015 21:45:32 +0000 (-0400) Subject: JBAS-682 Remove duplicate Holds function definition X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9b15db8cb57e8e55a647e4413198113d7f1930a2;p=working%2FEvergreen.git JBAS-682 Remove duplicate Holds function definition Function pickup_lib_changed_on_shelf_holds() in Holds.pm was duplicated during 2.5 merge. Remove the extra def to avoid warnings and keep things clean. Signed-off-by: Bill Erickson --- 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 4c40d2fec1..0f9cf3df90 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm @@ -3779,44 +3779,6 @@ sub clear_shelf_process { $client->respond_complete; } } - # returns IDs for holds that are on the holds shelf but - # have had their pickup_libs change while on the shelf. - - - sub pickup_lib_changed_on_shelf_holds { - my $e = shift; - my $org_id = shift; - my $ignore_holds = shift; - $ignore_holds = [$ignore_holds] if !ref($ignore_holds); - - my $query = { - select => { alhr => ['id'] }, - from => { - alhr => { - acp => { - field => 'id', - fkey => 'current_copy' - }, - } - }, - where => { - '+acp' => { status => OILS_COPY_STATUS_ON_HOLDS_SHELF }, - '+alhr' => { - capture_time => { "!=" => undef }, - fulfillment_time => undef, - current_shelf_lib => $org_id, - pickup_lib => {'!=' => {'+alhr' => 'current_shelf_lib'}} - } - } - }; - - $query->{where}->{'+alhr'}->{id} = - {'not in' => $ignore_holds} if @$ignore_holds; - - my $hold_ids = $e->json_query($query); - return [ map { $_->{id} } @$hold_ids ]; -} - # returns IDs for holds that are on the holds shelf but