[Koha-cvs] CVS: koha/C4 Accounts.pm,1.5,1.6

[Andrew Arensburger]

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

Modified Files:
        Accounts.pm 
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.


Index: Accounts.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Accounts.pm 23 Sep 2002 13:49:46 -0000      1.5
--- Accounts.pm 5 Oct 2002 09:47:52 -0000       1.6
***************
*** 22,26 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Format;
  use C4::Search;
--- 22,26 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Format;
  use C4::Search;
***************
*** 104,108 ****
    #print put money owing give person opportunity to pay it off
    my ($env,$dummy,$bornumber,$total)address@hidden;
!   my $dbh = &C4Connect;
    #get borrower record
    my $sth=$dbh->prepare("select * from borrowers
--- 104,108 ----
    #print put money owing give person opportunity to pay it off
    my ($env,$dummy,$bornumber,$total)address@hidden;
!   my $dbh = C4::Context->dbh;
    #get borrower record
    my $sth=$dbh->prepare("select * from borrowers
***************
*** 145,149 ****
      $total=&checkaccount($env,$bornumber,$dbh);
    }
-   $dbh->disconnect;
    return($total);
  
--- 145,148 ----
***************
*** 187,190 ****
--- 186,190 ----
       (borrowernumber, accountno, offsetaccount,  offsetamount)
       values ($bornumber,$accdata->{'accountno'},$nextaccntno,$newamtos)";
+      # FIXME - There's already a $usth in this scope.
       my $usth = $dbh->prepare($updquery);
  #     print $updquery