[Koha-cvs] CVS: koha/C4/Circulation Issues.pm,1.2,1.3

[Andrew Arensburger]

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

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


Index: Issues.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Issues.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Issues.pm	14 Aug 2002 18:12:52 -0000	1.2
--- Issues.pm	5 Oct 2002 09:54:32 -0000	1.3
***************
*** 25,33 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Accounts;
  use C4::InterfaceCDK;
  use C4::Circulation::Main;
  use C4::Circulation::Borrower;
  use C4::Scan;
  use C4::Stats;
--- 25,37 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Accounts;
  use C4::InterfaceCDK;
  use C4::Circulation::Main;
+ 	# FIXME - C4::Circulation::Main and C4::Circulation::Issues
+ 	# use each other, so functions get redefined.
  use C4::Circulation::Borrower;
+ 	# FIXME - C4::Circulation::Issues and C4::Circulation::Borrower
+ 	# use each other, so functions get redefined.
  use C4::Scan;
  use C4::Stats;
***************
*** 80,84 ****
  sub Issue  {
     my ($env) = @_;
!    my $dbh=&C4Connect;
     #clear help
     helptext('');
--- 84,88 ----
  sub Issue  {
     my ($env) = @_;
!    my $dbh = C4::Context->dbh;
     #clear help
     helptext('');
***************
*** 114,119 ****
       }
     }   
!    $dbh->disconnect;
!     Cdk::refreshCdkScreen();
     return ($done);
  }    
--- 118,122 ----
       }
     }   
!    Cdk::refreshCdkScreen();
     return ($done);
  }    
***************
*** 123,127 ****
    #process a users items
     my ($env,$bornum,$borrower,$items,$items2,$it2p,$amountdue,$itemsdet,$odues)=@_;
!    my $dbh=&C4Connect;  
     $env->{'newborrower'} = "";
     my ($itemnum,$reason) = 
--- 126,130 ----
    #process a users items
     my ($env,$bornum,$borrower,$items,$items2,$it2p,$amountdue,$itemsdet,$odues)=@_;
!    my $dbh = C4::Context->dbh;
     $env->{'newborrower'} = "";
     my ($itemnum,$reason) = 
***************
*** 142,146 ****
       }
     }   
-    $dbh->disconnect;
     #check to see if more books to process for this user
     my @done;
--- 145,148 ----
***************
*** 167,171 ****
     }
     #debug_msg($env, "return from issues $done[0]"); 
-    $dbh->disconnect;
     return @done;
  }
--- 169,172 ----
***************
*** 375,378 ****
--- 376,383 ----
  }
  
+ # FIXME - This is very similar to
+ # &C4::Circulation::Renewals2::calc_charges and
+ # &C4::Circulation::Circ2::calc_charges.
+ # Pick one and stick with it.
  sub calc_charges {
    # calculate charges due
***************
*** 399,403 ****
  	$charge = ($charge *(100 - $discount)) / 100;
       }
!      $sth2->{'finish'};
    }   
    $sth1->finish;
--- 404,408 ----
  	$charge = ($charge *(100 - $discount)) / 100;
       }
!      $sth2->{'finish'};	# FIXME - Was this supposed to be $sth2->finish ?
    }   
    $sth1->finish;