[Koha-cvs] CVS: koha/updater updatedatabase2.pl,1.4,1.5

[Andrew Arensburger]

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

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


Index: updatedatabase2.pl
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase2.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** updatedatabase2.pl  14 Aug 2002 18:12:54 -0000      1.4
--- updatedatabase2.pl  5 Oct 2002 10:17:31 -0000       1.5
***************
*** 32,36 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
! use C4::Database;
  use C4::Catalogue;
  use DBI;
--- 32,36 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
! use C4::Context;
  use C4::Catalogue;
  use DBI;
***************
*** 40,44 ****
  sub droptable {
        my ($dbh,$tablename)address@hidden;
!       if ($tables{$tablename}) {
                print "     - $tablename...\n";
                my $sti=$dbh->prepare("DROP TABLE $tablename");
--- 40,44 ----
  sub droptable {
        my ($dbh,$tablename)address@hidden;
!       if ($tables{$tablename}) {      # FIXME - $tables undefined
                print "     - $tablename...\n";
                my $sti=$dbh->prepare("DROP TABLE $tablename");
***************
*** 59,63 ****
  
  
! my $dbh=C4Connect;
  
  my %tables;
--- 59,63 ----
  
  
! my $dbh = C4::Context->dbh;
  
  my %tables;
***************
*** 80,83 ****
--- 80,84 ----
                if ($sti2->err) {
                        print "error : ".$sti2->errstr." \n tried to execute : 
$sql_cmd\n";
+                       # FIXME - $sql_cmd undefined
                        die;
                }