[Koha-cvs] CVS: koha/C4/Circulation Fines.pm,1.4,1.4.2.1

[Andrew Arensburger]

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv19264

Modified Files:
      Tag: arensb-context
        Fines.pm 
Log Message:
Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
C4Connect.


Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** Fines.pm    14 Aug 2002 18:12:52 -0000      1.4
--- Fines.pm    4 Oct 2002 02:27:39 -0000       1.4.2.1
***************
*** 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,address@hidden);  
--- 83,86 ----
***************
*** 90,94 ****
  sub CalcFine {
    my ($itemnumber,$bortype,$difference)address@hidden;
!   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)address@hidden;
!   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)address@hidden;
!   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)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from accountlines where itemnumber=$itemnum and
    borrowernumber=$bornum and (accounttype='FU' or accounttype='O' or
***************
*** 172,181 ****
    }
    $sth->finish;
-   $dbh->disconnect;
  }
  
  sub BorType {
    my ($borrowernumber)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from borrowers,categories where 
    borrowernumber=$borrowernumber and
--- 170,178 ----
    }
    $sth->finish;
  }
  
  sub BorType {
    my ($borrowernumber)address@hidden;
!   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);
  }
--- 182,185 ----
***************
*** 191,195 ****
  sub ReplacementCost{
    my ($itemnum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select replacementprice from items where itemnumber='$itemnum'";
    my $sth=$dbh->prepare($query);
--- 187,191 ----
  sub ReplacementCost{
    my ($itemnum)address@hidden;
!   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'});
  }
--- 193,196 ----