From 8cda0ec3ac775f012c792cab19f6ef679d7bbaab Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 17 Aug 2006 14:03:42 +0000 Subject: [PATCH] making sure to return early when already in transit to a different lib, reshelving an item when available and gets checked in git-svn-id: svn://svn.open-ils.org/ILS/trunk@5552 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm index daed84ec4c..b98c1e2fb3 100644 --- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm +++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm @@ -1130,7 +1130,6 @@ sub do_checkin { $self->push_events($self->check_copy_alert()); $self->push_events($self->check_checkin_copy_status()); - # the renew code will have already found our circulation object unless( $self->is_renewal and $self->circ ) { @@ -1264,7 +1263,6 @@ sub reshelve_copy { if($force || ( $stat != OILS_COPY_STATUS_ON_HOLDS_SHELF and - $stat != OILS_COPY_STATUS_AVAILABLE and $stat != OILS_COPY_STATUS_CATALOGING and $stat != OILS_COPY_STATUS_IN_TRANSIT and $stat != OILS_COPY_STATUS_RESHELVING )) { @@ -1412,11 +1410,11 @@ sub process_received_transit { my $transit = $self->transit; if( $transit->dest != $self->editor->requestor->ws_ou ) { - $logger->activity("Fowarding transit on copy which is destined ". + $logger->info("circulator: Fowarding transit on copy which is destined ". "for a different location. copy=$copyid,current ". "location=".$self->editor->requestor->ws_ou.",destination location=".$transit->dest); - $self->bail_on_events( + return $self->bail_on_events( OpenILS::Event->new('ROUTE_ITEM', org => $transit->dest )); } -- 2.11.0