[Koha-cvs] CVS: koha/C4/Circulation Main.pm,1.4,1.5

[Andrew Arensburger]

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

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


Index: Main.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Main.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Main.pm	1 Oct 2002 11:52:16 -0000	1.4
--- Main.pm	5 Oct 2002 09:54:41 -0000	1.5
***************
*** 24,32 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Circulation::Issues;
  use C4::Circulation::Returns;
  use C4::Circulation::Renewals;
  use C4::Circulation::Borrower;
  use C4::Reserves;
  use C4::Search;
--- 24,40 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Circulation::Issues;
+ 	# FIXME - C4::Circulation::Main and C4::Circulation::Issues
+ 	# use each other, so functions get redefined.
  use C4::Circulation::Returns;
+ 	# FIXME - C4::Circulation::Main and C4::Circulation::Returns
+ 	# use each other, so functions get redefined.
  use C4::Circulation::Renewals;
+ 	# FIXME - C4::Circulation::Main and C4::Circulation::Renewals
+ 	# use each other, so functions get redefined.
  use C4::Circulation::Borrower;
+ 	# FIXME - C4::Circulation::Main and C4::Circulation::Borrower
+ 	# use each other, so functions get redefined.
  use C4::Reserves;
  use C4::Search;
***************
*** 80,84 ****
  sub getbranch {
    my ($env) = @_;
!   my $dbh = C4Connect;
    my $query = "select * from branches order by branchcode";
    my $sth = $dbh->prepare($query);
--- 88,92 ----
  sub getbranch {
    my ($env) = @_;
!   my $dbh = C4::Context->dbh;
    my $query = "select * from branches order by branchcode";
    my $sth = $dbh->prepare($query);
***************
*** 102,111 ****
    $env->{'branchname'} = $data->{'branchname'};
    $sth->finish;
-   $dbh->disconnect;
  }
  
  sub getprinter {
    my ($env) = @_;
!   my $dbh = C4Connect;
    my $query = "select * from printers order by printername";
    my $sth = $dbh->prepare($query);
--- 110,118 ----
    $env->{'branchname'} = $data->{'branchname'};
    $sth->finish;
  }
  
  sub getprinter {
    my ($env) = @_;
!   my $dbh = C4::Context->dbh;
    my $query = "select * from printers order by printername";
    my $sth = $dbh->prepare($query);
***************
*** 123,128 ****
    }
    $sth->finish;
!   $dbh->disconnect;
!   }
  		      
  # FIXME - This is not the same as &C4::Circulation::pastitems, though
--- 130,134 ----
    }
    $sth->finish;
! }
  		      
  # FIXME - This is not the same as &C4::Circulation::pastitems, though