[Koha-cvs] CVS: koha/C4/Circulation Issues.pm,1.4,1.5
Andrew Arensburger
arensb at users.sourceforge.net
Sun Oct 13 10:31:37 CEST 2002
Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv15193
Modified Files:
Issues.pm
Log Message:
Deleted unused variables.
Removed trailing whitespace.
Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Issues.pm 13 Oct 2002 06:20:22 -0000 1.4
--- Issues.pm 13 Oct 2002 08:31:35 -0000 1.5
***************
*** 44,48 ****
use C4::Input;
use vars qw($VERSION @ISA @EXPORT);
!
# set the version for version checking
$VERSION = 0.01;
--- 44,48 ----
use C4::Input;
use vars qw($VERSION @ISA @EXPORT);
!
# set the version for version checking
$VERSION = 0.01;
***************
*** 86,90 ****
$done = "Issues";
while ($done eq "Issues") {
! my ($bornum,$issuesallowed,$borrower,$reason,$amountdue) = &findborrower($env,$dbh);
#C4::Circulation::Borrowers
$env->{'loanlength'}="";
--- 86,90 ----
$done = "Issues";
while ($done eq "Issues") {
! my ($bornum,$issuesallowed,$borrower,$reason,$amountdue) = &findborrower($env,$dbh);
#C4::Circulation::Borrowers
$env->{'loanlength'}="";
***************
*** 97,101 ****
$env->{'bcard'} = $borrower->{'cardnumber'};
#deal with alternative loans
! #now check items
($items,$items2)=
C4::Circulation::Main::pastitems($env,$bornum,$dbh); #from Circulation.pm
--- 97,101 ----
$env->{'bcard'} = $borrower->{'cardnumber'};
#deal with alternative loans
! #now check items
($items,$items2)=
C4::Circulation::Main::pastitems($env,$bornum,$dbh); #from Circulation.pm
***************
*** 109,116 ****
#&endint($env);
}
! }
Cdk::refreshCdkScreen();
return ($done);
! }
# FIXME - Not exported, but called by "telnet/borrwraper.pl".
--- 109,116 ----
#&endint($env);
}
! }
Cdk::refreshCdkScreen();
return ($done);
! }
# FIXME - Not exported, but called by "telnet/borrwraper.pl".
***************
*** 121,125 ****
my $dbh = C4::Context->dbh;
$env->{'newborrower'} = "";
! my ($itemnum,$reason) =
issuewindow($env,'Issues',$dbh,$items,$items2,$borrower,fmtdec($env,$amountdue,"32"));
if ($itemnum eq ""){
--- 121,125 ----
my $dbh = C4::Context->dbh;
$env->{'newborrower'} = "";
! my ($itemnum,$reason) =
issuewindow($env,'Issues',$dbh,$items,$items2,$borrower,fmtdec($env,$amountdue,"32"));
if ($itemnum eq ""){
***************
*** 137,144 ****
$amountdue += $charge;
}
! }
#check to see if more books to process for this user
my @done;
! if ($env->{'newborrower'} ne "") {$reason = "Finished user";}
if ($reason eq 'Finished user'){
if (@$items2[0] ne "") {
--- 137,144 ----
$amountdue += $charge;
}
! }
#check to see if more books to process for this user
my @done;
! if ($env->{'newborrower'} ne "") {$reason = "Finished user";}
if ($reason eq 'Finished user'){
if (@$items2[0] ne "") {
***************
*** 147,151 ****
&reconcileaccount($env,$dbh,$borrower->{'borrowernumber'},$amountdue);
}
! }
@done = ("Issues");
} elsif ($reason eq "Print"){
--- 147,151 ----
&reconcileaccount($env,$dbh,$borrower->{'borrowernumber'},$amountdue);
}
! }
@done = ("Issues");
} elsif ($reason eq "Print"){
***************
*** 154,158 ****
} else {
if ($reason ne 'Finished issues'){
! #return No to let them know that we wish to
# process more Items for borrower
@done = ("No",$items2,$it2p,$amountdue,$itemsdet);
--- 154,158 ----
} else {
if ($reason ne 'Finished issues'){
! #return No to let them know that we wish to
# process more Items for borrower
@done = ("No",$items2,$it2p,$amountdue,$itemsdet);
***************
*** 161,165 ****
}
}
! #debug_msg($env, "return from issues $done[0]");
return @done;
}
--- 161,165 ----
}
}
! #debug_msg($env, "return from issues $done[0]");
return @done;
}
***************
*** 208,212 ****
my $line = $line.fmtdec($env,$charge,"22"); # FIXME - .=
return $line;
! }
# Only used internally
--- 208,212 ----
my $line = $line.fmtdec($env,$charge,"22"); # FIXME - .=
return $line;
! }
# Only used internally
***************
*** 223,227 ****
my $charge;
my $datedue = $env->{'loanlength'};
! my $sth=$dbh->prepare($query);
$sth->execute;
if ($item=$sth->fetchrow_hashref) {
--- 223,227 ----
my $charge;
my $datedue = $env->{'loanlength'};
! my $sth=$dbh->prepare($query);
$sth->execute;
if ($item=$sth->fetchrow_hashref) {
***************
*** 235,239 ****
$canissue = 0;
# } elsif ($item->{'itemlost'} == 1) {
! # error_msg($env,"Item Lost");
# $canissue = 0;
} elsif ($item->{'restricted'} == 1 ){
--- 235,239 ----
$canissue = 0;
# } elsif ($item->{'itemlost'} == 1) {
! # error_msg($env,"Item Lost");
# $canissue = 0;
} elsif ($item->{'restricted'} == 1 ){
***************
*** 251,257 ****
#check if item is on issue already
if ($canissue == 1) {
! my ($currbor,$issuestat,$newdate) =
&C4::Circulation::Main::previousissue($env,$item->{'itemnumber'},$dbh,$bornum);
! if ($issuestat eq "N") {
$canissue = 0;
} elsif ($issuestat eq "R") {
--- 251,257 ----
#check if item is on issue already
if ($canissue == 1) {
! my ($currbor,$issuestat,$newdate) =
&C4::Circulation::Main::previousissue($env,$item->{'itemnumber'},$dbh,$bornum);
! if ($issuestat eq "N") {
$canissue = 0;
} elsif ($issuestat eq "R") {
***************
*** 263,274 ****
}
&UpdateStats($env,$env->{'branchcode'},'renew',$charge,'',$item->{'itemnumber'},$item->{'itemtype'});
! }
! }
if ($canissue == 1) {
#check reserve
! my ($resbor,$resrec) = &C4::Circulation::Main::checkreserve($env,$dbh,$item->{'itemnumber'});
#debug_msg($env,$resbor);
! if ($resbor eq $bornum) {
! my $rquery = "update reserves
set found = 'F'
where reservedate = '$resrec->{'reservedate'}'
--- 263,274 ----
}
&UpdateStats($env,$env->{'branchcode'},'renew',$charge,'',$item->{'itemnumber'},$item->{'itemtype'});
! }
! }
if ($canissue == 1) {
#check reserve
! my ($resbor,$resrec) = &C4::Circulation::Main::checkreserve($env,$dbh,$item->{'itemnumber'});
#debug_msg($env,$resbor);
! if ($resbor eq $bornum) {
! my $rquery = "update reserves
set found = 'F'
where reservedate = '$resrec->{'reservedate'}'
***************
*** 279,283 ****
$rsth->finish;
} elsif ($resbor ne "") {
! my $bquery = "select * from borrowers
where borrowernumber = '$resbor'";
my $btsh = $dbh->prepare($bquery);
--- 279,283 ----
$rsth->finish;
} elsif ($resbor ne "") {
! my $bquery = "select * from borrowers
where borrowernumber = '$resbor'";
my $btsh = $dbh->prepare($bquery);
***************
*** 295,299 ****
my $ans = msg_ny($env,"Cancel reserve?");
if ($ans eq "Y") {
! my $rquery = "update reserves
set found = 'F'
where reservedate = '$resrec->{'reservedate'}'
--- 295,299 ----
my $ans = msg_ny($env,"Cancel reserve?");
if ($ans eq "Y") {
! my $rquery = "update reserves
set found = 'F'
where reservedate = '$resrec->{'reservedate'}'
***************
*** 309,313 ****
}
#if charge deal with it
!
if ($canissue == 1) {
$charge = calc_charges($env,$dbh,$item->{'itemnumber'},$bornum);
--- 309,313 ----
}
#if charge deal with it
!
if ($canissue == 1) {
$charge = calc_charges($env,$dbh,$item->{'itemnumber'},$bornum);
***************
*** 320,327 ****
if ($charge > 0) {
createcharge($env,$dbh,$item->{'itemnumber'},$bornum,$charge);
! }
} elsif ($canissue == 0) {
info_msg($env,"Can't issue $item->{'cardnumber'}");
! }
} else {
my $valid = checkdigit($env,$itemnum);
--- 320,327 ----
if ($charge > 0) {
createcharge($env,$dbh,$item->{'itemnumber'},$bornum,$charge);
! }
} elsif ($canissue == 0) {
info_msg($env,"Can't issue $item->{'cardnumber'}");
! }
} else {
my $valid = checkdigit($env,$itemnum);
***************
*** 330,339 ****
#this is a borrower
$env->{'newborrower'} = $itemnum;
! } else {
error_msg($env,"$itemnum not found - rescan");
}
} else {
error_msg($env,"Invalid Number");
! }
}
$sth->finish;
--- 330,339 ----
#this is a borrower
$env->{'newborrower'} = $itemnum;
! } else {
error_msg($env,"$itemnum not found - rescan");
}
} else {
error_msg($env,"Invalid Number");
! }
}
$sth->finish;
***************
*** 363,367 ****
my $loanlength=21;
my $query="Select * from biblioitems,itemtypes
! where (biblioitems.biblioitemnumber='$bitno')
and (biblioitems.itemtype = itemtypes.itemtype)";
my $sth=$dbh->prepare($query);
--- 363,367 ----
my $loanlength=21;
my $query="Select * from biblioitems,itemtypes
! where (biblioitems.biblioitemnumber='$bitno')
and (biblioitems.itemtype = itemtypes.itemtype)";
my $sth=$dbh->prepare($query);
***************
*** 370,374 ****
$loanlength = $data->{'loanlength'}
}
! $sth->finish;
my $dateduef;
if ($env->{'loanlength'} eq "") {
--- 370,374 ----
$loanlength = $data->{'loanlength'}
}
! $sth->finish;
my $dateduef;
if ($env->{'loanlength'} eq "") {
***************
*** 379,383 ****
} else {
$dateduef = $env->{'loanlength'};
! }
$query = "Insert into issues (borrowernumber,itemnumber, date_due,branchcode)
values ($bornum,$itemno,'$dateduef','$env->{'branchcode'}')";
--- 379,383 ----
} else {
$dateduef = $env->{'loanlength'};
! }
$query = "Insert into issues (borrowernumber,itemnumber, date_due,branchcode)
values ($bornum,$itemno,'$dateduef','$env->{'branchcode'}')";
***************
*** 422,427 ****
$item_type = $data1->{'itemtype'};
$charge = $data1->{'rentalcharge'};
! my $q2 = "select rentaldiscount from borrowers,categoryitem
! where (borrowers.borrowernumber = '$bornum')
and (borrowers.categorycode = categoryitem.categorycode)
and (categoryitem.itemtype = '$item_type')";
--- 422,427 ----
$item_type = $data1->{'itemtype'};
$charge = $data1->{'rentalcharge'};
! my $q2 = "select rentaldiscount from borrowers,categoryitem
! where (borrowers.borrowernumber = '$bornum')
and (borrowers.categorycode = categoryitem.categorycode)
and (categoryitem.itemtype = '$item_type')";
***************
*** 433,437 ****
}
$sth2->{'finish'}; # FIXME - Was this supposed to be $sth2->finish ?
! }
$sth1->finish;
return ($charge);
--- 433,437 ----
}
$sth2->{'finish'}; # FIXME - Was this supposed to be $sth2->finish ?
! }
$sth1->finish;
return ($charge);
More information about the Koha-cvs
mailing list