[Koha-cvs] CVS: koha/acqui newbiblio.pl,1.7,1.8

[Andrew Arensburger]

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

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


Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newbiblio.pl        14 Aug 2002 18:12:52 -0000      1.7
--- newbiblio.pl        5 Oct 2002 09:55:27 -0000       1.8
***************
*** 22,32 ****
  # Suite 330, Boston, MA  02111-1307 USA
  
  use C4::Catalogue;
  use C4::Biblio;
  use C4::Output;
  use C4::Search;
- use C4::Database;
- 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;
***************
*** 177,181 ****
  ;
  
! my $dbh=C4Connect;
  my $query="Select itemtype,description from itemtypes order by description";
  my $sth=$dbh->prepare($query);
--- 177,181 ----
  ;
  
! my $dbh = C4::Context->dbh;
  my $query="Select itemtype,description from itemtypes order by description";
  my $sth=$dbh->prepare($query);
***************
*** 190,194 ****
  }
  $sth->finish;
- $dbh->disconnect;
  
  print <<printend
--- 190,193 ----
***************
*** 235,239 ****
  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);
--- 234,238 ----
  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);
***************
*** 242,246 ****
    print $data->{'barcode'}+1;
    $sth->finish;
-   $dbh->disconnect;
  }
  
--- 241,244 ----