[Koha-cvs] CVS: koha/C4 Acquisitions.pm,1.24,1.25

[Andrew Arensburger]

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

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


Index: Acquisitions.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisitions.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** Acquisitions.pm     1 Oct 2002 13:22:02 -0000       1.24
--- Acquisitions.pm     5 Oct 2002 09:48:26 -0000       1.25
***************
*** 26,30 ****
  use strict;
  require Exporter;
! use C4::Database;
   #use C4::Biblio;
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
--- 26,30 ----
  use strict;
  require Exporter;
! use C4::Context;
   #use C4::Biblio;
[...1327 lines suppressed...]
      my $query = "Delete from websites where websitenumber = $websitenumber";
      
      $dbh->do($query);
-     
-     $dbh->disconnect;
  } # sub deletewebsite
  
--- 1921,1932 ----
  sub deletewebsite {
      my ($websitenumber) = @_;
!     my $dbh = C4::Context->dbh;
!     # FIXME - $query is unnecessary: just use
!     # $dbh->do(<<EOT);
!     # DELETE FROM websites where websitenumber=$websitenumber
!     # EOT
      my $query = "Delete from websites where websitenumber = $websitenumber";
      
      $dbh->do($query);
  } # sub deletewebsite