[Koha-cvs] CVS: koha/C4/Circulation Fines.pm,1.4,1.5
Andrew Arensburger
arensb at users.sourceforge.net
Sat Oct 5 11:54:23 CEST 2002
Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv23497/C4/Circulation
Modified Files:
Fines.pm
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.
Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Fines.pm 14 Aug 2002 18:12:52 -0000 1.4
--- Fines.pm 5 Oct 2002 09:54:21 -0000 1.5
***************
*** 25,29 ****
require Exporter;
use DBI;
! use C4::Database;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 25,29 ----
require Exporter;
use DBI;
! use C4::Context;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 71,75 ****
sub Getoverdues{
! my $dbh=C4Connect;
my $query="Select * from issues where date_due < now() and returndate is
NULL order by borrowernumber";
--- 71,75 ----
sub Getoverdues{
! my $dbh = C4::Context->dbh;
my $query="Select * from issues where date_due < now() and returndate is
NULL order by borrowernumber";
***************
*** 83,87 ****
}
$sth->finish;
- $dbh->disconnect;
# print @results;
return($i,\@results);
--- 83,86 ----
***************
*** 90,94 ****
sub CalcFine {
my ($itemnumber,$bortype,$difference)=@_;
! my $dbh=C4Connect;
my $query="Select * from items,biblioitems,itemtypes,categoryitem where items.itemnumber=$itemnumber
and items.biblioitemnumber=biblioitems.biblioitemnumber and
--- 89,93 ----
sub CalcFine {
my ($itemnumber,$bortype,$difference)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from items,biblioitems,itemtypes,categoryitem where items.itemnumber=$itemnumber
and items.biblioitemnumber=biblioitems.biblioitemnumber and
***************
*** 116,120 ****
$printout="Final Notice";
}
- $dbh->disconnect;
return($amount,$data->{'chargename'},$printout);
}
--- 115,118 ----
***************
*** 122,126 ****
sub UpdateFine {
my ($itemnum,$bornum,$amount,$type,$due)=@_;
! my $dbh=C4Connect;
my $query="Select * from accountlines where itemnumber=$itemnum and
borrowernumber=$bornum and (accounttype='FU' or accounttype='O' or
--- 120,124 ----
sub UpdateFine {
my ($itemnum,$bornum,$amount,$type,$due)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from accountlines where itemnumber=$itemnum and
borrowernumber=$bornum and (accounttype='FU' or accounttype='O' or
***************
*** 155,158 ****
--- 153,157 ----
$sth4->finish;
# print "not in account";
+ # FIXME - There's already a $query2 in this scope.
my $query2="Select max(accountno) from accountlines";
my $sth3=$dbh->prepare($query2);
***************
*** 172,181 ****
}
$sth->finish;
- $dbh->disconnect;
}
sub BorType {
my ($borrowernumber)=@_;
! my $dbh=C4Connect;
my $query="Select * from borrowers,categories where
borrowernumber=$borrowernumber and
--- 171,179 ----
}
$sth->finish;
}
sub BorType {
my ($borrowernumber)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from borrowers,categories where
borrowernumber=$borrowernumber and
***************
*** 185,189 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
return($data);
}
--- 183,186 ----
***************
*** 191,195 ****
sub ReplacementCost{
my ($itemnum)=@_;
! my $dbh=C4Connect;
my $query="Select replacementprice from items where itemnumber='$itemnum'";
my $sth=$dbh->prepare($query);
--- 188,192 ----
sub ReplacementCost{
my ($itemnum)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select replacementprice from items where itemnumber='$itemnum'";
my $sth=$dbh->prepare($query);
***************
*** 197,201 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
return($data->{'replacementprice'});
}
--- 194,197 ----
More information about the Koha-cvs
mailing list