[Koha-cvs] CVS: koha/acqui acquire.pl,1.5,1.6

[Andrew Arensburger]

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv23932/acqui

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


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acquire.pl  14 Aug 2002 18:12:52 -0000      1.5
--- acquire.pl  5 Oct 2002 09:55:18 -0000       1.6
***************
*** 22,32 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
  use C4::Catalogue;
  use C4::Biblio;
  use C4::Output;
- use C4::Database;
  use C4::Search;
- use CGI;
- use strict;
  
  my $input=new CGI;
--- 22,32 ----
  # Suite 330, Boston, MA  02111-1307 USA
  
+ use strict;
+ use CGI;
+ use C4::Context;
  use C4::Catalogue;
  use C4::Biblio;
  use C4::Output;
  use C4::Search;
  
  my $input=new CGI;
***************
*** 114,118 ****
  ;
  
! my $dbh=C4Connect;
  my $query="Select itemtype,description from itemtypes order by description";
  my $sth=$dbh->prepare($query);
--- 114,118 ----
  ;
  
! my $dbh = C4::Context->dbh;
  my $query="Select itemtype,description from itemtypes order by description";
  my $sth=$dbh->prepare($query);
***************
*** 126,130 ****
  }
  $sth->finish;
- $dbh->disconnect;
  
  print <<EOP
--- 126,129 ----
***************
*** 175,179 ****
  my %systemprefs=systemprefs();
  if ($systemprefs{'autoBarcode'} eq '1') {
!   my $dbh=C4Connect;
    my $query="Select barcode from items order by barcode desc";
    my $sth=$dbh->prepare($query);
--- 174,178 ----
  my %systemprefs=systemprefs();
  if ($systemprefs{'autoBarcode'} eq '1') {
!   my $dbh = C4::Context->dbh;
    my $query="Select barcode from items order by barcode desc";
    my $sth=$dbh->prepare($query);
***************
*** 182,186 ****
    print $data->{'barcode'}+1;
    $sth->finish;
-   $dbh->disconnect;
  }
  
--- 181,184 ----