X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fbranchtransfers.pl;h=3be7bb4387a22c8b2c98144df06c556797ace9d4;hb=b16336caf8132d73ae71d78b4efe38df56029b81;hp=8ae283dfe60899f7584b4145b2f194a1fc423433;hpb=9c72711a2c632fb679d6be215f9fdd6a3b96faa2;p=koha_fer diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index 8ae283dfe6..3be7bb4387 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -1,10 +1,9 @@ #!/usr/bin/perl -# WARNING: This file uses 4-character tabs! -#written 11/3/2002 by Finlay #script to execute branch transfers of books # Copyright 2000-2002 Katipo Communications +# copyright 2010 BibLibre # # This file is part of Koha. # @@ -17,11 +16,12 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +use warnings; use CGI; use C4::Circulation; use C4::Output; @@ -40,20 +40,18 @@ my $query = new CGI; if (!C4::Context->userenv){ my $sessionID = $query->cookie("CGISESSID"); - my $session = get_session($sessionID); - if ($session->param('branch') eq 'NO_LIBRARY_SET'){ + my $session; + $session = get_session($sessionID) if $sessionID; + if (!$session or $session->param('branch') eq 'NO_LIBRARY_SET'){ # no branch set we can't transfer print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl"); exit; } -} - +} ####################################################################################### # Make the page ..... -my ( $template, $cookie ); -my $user; -( $template, $user, $cookie ) = get_template_and_user( +my ($template, $user, $cookie) = get_template_and_user( { template_name => "circ/branchtransfers.tmpl", query => $query, @@ -64,7 +62,6 @@ my $user; ); my $branches = GetBranches; -my $branch = GetBranch( $query, $branches ); my $messages; my $found; @@ -74,52 +71,46 @@ my $reqmessage; my $cancelled; my $setwaiting; -my $request = $query->param('request'); -my $borrowernumber = $query->param('borrowernumber'); -my $tobranchcd = $query->param('tobranchcd'); +my $request = $query->param('request') || ''; +my $borrowernumber = $query->param('borrowernumber') || 0; +my $tobranchcd = $query->param('tobranchcd') || ''; +my $ignoreRs = 0; ############ # Deal with the requests.... if ( $request eq "KillWaiting" ) { my $item = $query->param('itemnumber'); - - CancelReserve( 0, $item, $borrowernumber ); + CancelReserve({ + itemnumber => $item, + borrowernumber => $borrowernumber + }); $cancelled = 1; $reqmessage = 1; } - -my $ignoreRs = 0; -if ( $request eq "SetWaiting" ) { +elsif ( $request eq "SetWaiting" ) { my $item = $query->param('itemnumber'); ModReserveAffect( $item, $borrowernumber ); $ignoreRs = 1; $setwaiting = 1; $reqmessage = 1; } -if ( $request eq 'KillReserved' ) { +elsif ( $request eq 'KillReserved' ) { my $biblio = $query->param('biblionumber'); - CancelReserve( $biblio, 0, $borrowernumber ); + CancelReserve({ + biblionumber => $biblio, + borrowernumber => $borrowernumber + }); $cancelled = 1; $reqmessage = 1; } -# set up the branchselect options.... -my @branchoptionloop; -foreach my $br ( keys %$branches ) { - my %branch; - $branch{selected} = ( $br eq $tobranchcd ); - $branch{code} = $br; - $branch{name} = $branches->{$br}->{'branchname'}; - push( @branchoptionloop, \%branch ); -} - # collect the stack of books already transfered so they can printed... my @trsfitemloop; my %transfereditems; my $transfered; my $barcode = $query->param('barcode'); # strip whitespace -$barcode =~ s/\s*//g; +defined $barcode and $barcode =~ s/\s*//g; # FIXME: barcodeInputFilter # warn "barcode : $barcode"; if ($barcode) { @@ -133,13 +124,16 @@ if ($barcode) { my %item; my $frbranchcd = C4::Context->userenv->{'branch'}; # if ( not($found) ) { - $item{'biblionumber'} = $iteminformation->{'biblionumber'}; - $item{'title'} = $iteminformation->{'title'}; - $item{'author'} = $iteminformation->{'author'}; - $item{'itemtype'} = $iteminformation->{'itemtype'}; - $item{'ccode'} = $iteminformation->{'ccode'}; - $item{'frbrname'} = $branches->{$frbranchcd}->{'branchname'}; - $item{'tobrname'} = $branches->{$tobranchcd}->{'branchname'}; + $item{'biblionumber'} = $iteminformation->{'biblionumber'}; + $item{'itemnumber'} = $iteminformation->{'itemnumber'}; + $item{'title'} = $iteminformation->{'title'}; + $item{'author'} = $iteminformation->{'author'}; + $item{'itemtype'} = $iteminformation->{'itemtype'}; + $item{'ccode'} = $iteminformation->{'ccode'}; + $item{'itemcallnumber'} = $iteminformation->{'itemcallnumber'}; + $item{'location'} = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'}); + $item{'frbrname'} = $branches->{$frbranchcd}->{'branchname'}; + $item{'tobrname'} = $branches->{$tobranchcd}->{'branchname'}; # } $item{counter} = 0; $item{barcode} = $barcode; @@ -163,13 +157,16 @@ foreach ( $query->param ) { $item{frombrcd} = $frbcd; $item{tobrcd} = $tobcd; my ($iteminformation) = GetBiblioFromItemNumber( GetItemnumberFromBarcode($bc) ); - $item{'biblionumber'} = $iteminformation->{'biblionumber'}; - $item{'title'} = $iteminformation->{'title'}; - $item{'author'} = $iteminformation->{'author'}; - $item{'itemtype'} = $iteminformation->{'itemtype'}; - $item{'ccode'} = $iteminformation->{'ccode'}; - $item{'frbrname'} = $branches->{$frbcd}->{'branchname'}; - $item{'tobrname'} = $branches->{$tobcd}->{'branchname'}; + $item{'biblionumber'} = $iteminformation->{'biblionumber'}; + $item{'itemnumber'} = $iteminformation->{'itemnumber'}; + $item{'title'} = $iteminformation->{'title'}; + $item{'author'} = $iteminformation->{'author'}; + $item{'itemtype'} = $iteminformation->{'itemtype'}; + $item{'ccode'} = $iteminformation->{'ccode'}; + $item{'itemcallnumber'} = $iteminformation->{'itemcallnumber'}; + $item{'location'} = GetKohaAuthorisedValueLib("LOC",$iteminformation->{'location'}); + $item{'frbrname'} = $branches->{$frbcd}->{'branchname'}; + $item{'tobrname'} = $branches->{$tobcd}->{'branchname'}; push( @trsfitemloop, \%item ); } @@ -185,7 +182,7 @@ if ($found) { if ( $res->{'ResFound'} eq "Waiting" ) { $waiting = 1; } - if ( $res->{'ResFound'} eq "Reserved" ) { + elsif ( $res->{'ResFound'} eq "Reserved" ) { $reserved = 1; $biblionumber = $res->{'biblionumber'}; } @@ -197,45 +194,42 @@ if ($found) { my $codeTypeDescription = 'Collection Code'; my $codeType = C4::Context->preference("BranchTransferLimitsType"); if ( $codeType eq 'itemtype' ) { - $codeTypeDescription = 'Item Type'; + $codeTypeDescription = 'Item Type'; } - my @errmsgloop; foreach my $code ( keys %$messages ) { - my %err; - - if ( $code eq 'BadBarcode' ) { - $err{msg} = $messages->{'BadBarcode'}; - $err{errbadcode} = 1; - } - - if ( $code eq "NotAllowed" ) { - warn $messages->{'NotAllowed'}; - warn $branches->{ $messages->{'NotAllowed'} }->{'branchname'}; - $err{errnotallowed} = 1; - my ( $tbr, $typecode ) = split( /::/, $messages->{'NotAllowed'} ); - $err{tbr} = $branches->{ $tbr }->{'branchname'}; - $err{code} = $typecode; - $err{codeType} = $codeTypeDescription; - } - - if ( $code eq 'IsPermanent' ) { - $err{errispermanent} = 1; - $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'}; + if ( $code ne 'WasTransfered' ) { + my %err; + if ( $code eq 'BadBarcode' ) { + $err{msg} = $messages->{'BadBarcode'}; + $err{errbadcode} = 1; + } + elsif ( $code eq "NotAllowed" ) { + warn "NotAllowed: $messages->{'NotAllowed'} to " . $branches->{ $messages->{'NotAllowed'} }->{'branchname'}; + # Do we really want a error log message here? --atz + $err{errnotallowed} = 1; + my ( $tbr, $typecode ) = split( /::/, $messages->{'NotAllowed'} ); + $err{tbr} = $branches->{ $tbr }->{'branchname'}; + $err{code} = $typecode; + $err{codeType} = $codeTypeDescription; + } + elsif ( $code eq 'IsPermanent' ) { + $err{errispermanent} = 1; + $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'}; + } + elsif ( $code eq 'WasReturned' ) { + $err{errwasreturned} = 1; + $err{borrowernumber} = $messages->{'WasReturned'}; + my $borrower = GetMember('borrowernumber'=>$messages->{'WasReturned'}); + $err{title} = $borrower->{'title'}; + $err{firstname} = $borrower->{'firstname'}; + $err{surname} = $borrower->{'surname'}; + $err{cardnumber} = $borrower->{'cardnumber'}; + } + $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' ); + push( @errmsgloop, \%err ); } - $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' ); - - if ( $code eq 'WasReturned' ) { - $err{errwasreturned} = 1; - $err{borrowernumber}=$messages->{'WasReturned'}; - my $borrower = GetMember($messages->{'WasReturned'},'borrowernumber'); - $err{title}=$borrower->{'title'}; - $err{firstname}=$borrower->{'firstname'}; - $err{surname}=$borrower->{'surname'}; - $err{cardnumber} =$borrower->{'cardnumber'}; - } - push( @errmsgloop, \%err ); } # use Data::Dumper; @@ -253,19 +247,9 @@ $template->param( cancelled => $cancelled, setwaiting => $setwaiting, trsfitemloop => \@trsfitemloop, - branchoptionloop => \@branchoptionloop, + branchoptionloop => GetBranchesLoop($tobranchcd), errmsgloop => \@errmsgloop, CircAutocompl => C4::Context->preference("CircAutocompl") ); output_html_with_http_headers $query, $cookie, $template->output; -sub name { - my ($borinfo) = @_; - return $borinfo->{'surname'} . " " - . $borinfo->{'title'} . " " - . $borinfo->{'firstname'}; -} - -# Local Variables: -# tab-width: 4 -# End: