[Koha-cvs] CVS: koha/updater updatedatabase,1.18,1.19

[Andrew Arensburger]

Update of /cvsroot/koha/koha/updater
In directory usw-pr-cvs1:/tmp/cvs-serv31856/updater

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


Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** updatedatabase      24 Sep 2002 13:50:55 -0000      1.18
--- updatedatabase      5 Oct 2002 10:17:17 -0000       1.19
***************
*** 20,24 ****
  
  # Koha modules
! use C4::Database;
  
  my $debug=0;
--- 20,24 ----
  
  # Koha modules
! use C4::Context;
  
  my $debug=0;
***************
*** 212,216 ****
  #-------------------
  # Initialize
! my $dbh=C4Connect;
  
  # Start checking
--- 212,216 ----
  #-------------------
  # Initialize
! my $dbh = C4::Context->dbh;
  
  # Start checking
***************
*** 315,318 ****
--- 315,319 ----
  my %itemtypes;
  
+ # FIXME - There's already a $sth in this scope.
  my $sth=$dbh->prepare("show columns from items");
  $sth->execute;
***************
*** 334,337 ****
--- 335,339 ----
  my %branchtransfers;
  
+ # FIXME - There's already a $sth in this scope.
  my $sth=$dbh->prepare("show columns from branchtransfers");
  $sth->execute;
***************
*** 355,358 ****
--- 357,361 ----
  my %branchcategories;
  
+ # FIXME - There's already a $sth in this scope.
  my $sth=$dbh->prepare("show columns from branchcategories");
  $sth->execute;
***************
*** 401,409 ****
  
  $sth->finish;
- $dbh->disconnect;
  
  exit;
  
  # $Log$
  # Revision 1.18  2002/09/24 13:50:55  tipaul
  # long WAS the road to 1.3.0...
--- 404,422 ----
  
  $sth->finish;
  
  exit;
  
  # $Log$
+ # Revision 1.19  2002/10/05 10:17:17  arensb
+ # Merged with arensb-context branch: use C4::Context->dbh instead of
+ # &C4Connect, and generally prefer C4::Context over C4::Database.
+ #
+ # Revision 1.18.2.2  2002/10/05 06:18:43  arensb
+ # Added a whole mess of FIXME comments.
+ #
+ # Revision 1.18.2.1  2002/10/04 02:46:00  arensb
+ # Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
+ # C4Connect.
+ #
  # Revision 1.18  2002/09/24 13:50:55  tipaul
  # long WAS the road to 1.3.0...