[Koha-cvs] CVS: koha/C4 Biblio.pm,1.12,1.12.2.1

[Andrew Arensburger]

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

Modified Files:
      Tag: arensb-context
        Biblio.pm 
Log Message:
Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
C4Connect.


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** Biblio.pm   1 Oct 2002 11:48:51 -0000       1.12
--- Biblio.pm   4 Oct 2002 02:24:01 -0000       1.12.2.1
***************
*** 2,5 ****
--- 2,9 ----
  # $Id$
  # $Log$
+ # Revision 1.12.2.1  2002/10/04 02:24:01  arensb
+ # Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
+ # C4Connect.
+ #
  # Revision 1.12  2002/10/01 11:48:51  arensb
  # Added some FIXME comments, mostly marking duplicate functions.
***************
*** 100,103 ****
--- 104,108 ----
  use strict;
  require Exporter;
+ use C4::Context;
  use C4::Database;
  use MARC::Record;
***************
*** 1099,1103 ****
      
      $sth->finish;
-     $dbh->disconnect;
      return($biblio->{'biblionumber'});
  } # sub modbiblio
--- 1104,1107 ----
***************
*** 1136,1141 ****
          $sth->finish;
      } # if
- 
-   $dbh->disconnect;
  } # sub modaddauthor
  
--- 1140,1143 ----
***************
*** 1537,1541 ****
  sub itemcount{
    my ($biblio)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select count(*) from items where biblionumber=$biblio";
  #  print $query;
--- 1539,1543 ----
  sub itemcount{
    my ($biblio)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select count(*) from items where biblionumber=$biblio";
  #  print $query;
***************
*** 1544,1548 ****
    my $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data->{'count(*)'});
  }
--- 1546,1549 ----
***************
*** 1550,1554 ****
  sub getorder{
    my ($bi,$bib)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select ordernumber 
        from aqorders 
--- 1551,1555 ----
  sub getorder{
    my ($bi,$bib)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select ordernumber 
        from aqorders 
***************
*** 1559,1563 ****
    $sth->finish;
    my $order=getsingleorder($ordnum->{'ordernumber'});
-   $dbh->disconnect;
  #  print $query;
    return ($order,$ordnum->{'ordernumber'});
--- 1560,1563 ----
***************
*** 1568,1572 ****
  sub getsingleorder {
    my ($ordnum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from biblio,biblioitems,aqorders,aqorderbreakdown 
    where aqorders.ordernumber=? 
--- 1568,1572 ----
  sub getsingleorder {
    my ($ordnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from biblio,biblioitems,aqorders,aqorderbreakdown 
    where aqorders.ordernumber=? 
***************
*** 1578,1582 ****
    my $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data);
  }
--- 1578,1581 ----
***************
*** 1584,1591 ****
  sub newbiblio {
    my ($biblio) = @_;
!   my $dbh    = &C4Connect;
    my $bibnum=OLDnewbiblio($dbh,$biblio);
  # TODO : MARC add
-   $dbh->disconnect;
    return($bibnum);
  }
--- 1583,1589 ----
  sub newbiblio {
    my ($biblio) = @_;
!   my $dbh    = C4::Context->dbh;
    my $bibnum=OLDnewbiblio($dbh,$biblio);
  # TODO : MARC add
    return($bibnum);
  }
***************
*** 1593,1599 ****
  sub modbiblio {
    my ($biblio) = @_;
!   my $dbh  = C4Connect;
    my $biblionumber=OLDmodbiblio($dbh,$biblio);
-   $dbh->disconnect;
    return($biblionumber);
  } # sub modbiblio
--- 1591,1596 ----
  sub modbiblio {
    my ($biblio) = @_;
!   my $dbh  = C4::Context->dbh;
    my $biblionumber=OLDmodbiblio($dbh,$biblio);
    return($biblionumber);
  } # sub modbiblio
***************
*** 1601,1607 ****
  sub modsubtitle {
    my ($bibnum, $subtitle) = @_;
!   my $dbh   = C4Connect;
    &OLDmodsubtitle($dbh,$bibnum,$subtitle);
-   $dbh->disconnect;
  } # sub modsubtitle
  
--- 1598,1603 ----
  sub modsubtitle {
    my ($bibnum, $subtitle) = @_;
!   my $dbh   = C4::Context->dbh;
    &OLDmodsubtitle($dbh,$bibnum,$subtitle);
  } # sub modsubtitle
  
***************
*** 1611,1617 ****
  sub modaddauthor {
      my ($bibnum, $author) = @_;
!     my $dbh   = C4Connect;
      &OLDmodaddauthor($dbh,$bibnum,$author);
-     $dbh->disconnect;
  } # sub modaddauthor
  
--- 1607,1612 ----
  sub modaddauthor {
      my ($bibnum, $author) = @_;
!     my $dbh   = C4::Context->dbh;
      &OLDmodaddauthor($dbh,$bibnum,$author);
  } # sub modaddauthor
  
***************
*** 1619,1623 ****
  sub modsubject {
    my ($bibnum, $force, @subject) = @_;
!   my $dbh   = C4Connect;
    my $error= &OLDmodsubject($dbh,$bibnum,$force, @subject);
    return($error);
--- 1614,1618 ----
  sub modsubject {
    my ($bibnum, $force, @subject) = @_;
!   my $dbh   = C4::Context->dbh;
    my $error= &OLDmodsubject($dbh,$bibnum,$force, @subject);
    return($error);
***************
*** 1626,1641 ****
  sub modbibitem {
      my ($biblioitem) = @_;
!     my $dbh   = C4Connect;
      &OLDmodbibitem($dbh,$biblioitem);
      my $MARCbibitem = MARCkoha2marcBiblio($dbh,$biblioitem);
      &MARCmodbiblio($dbh,$biblioitem->{biblionumber},0,$MARCbibitem);
-     $dbh->disconnect;
  } # sub modbibitem
  
  sub modnote {
    my ($bibitemnum,$note)address@hidden;
!   my $dbh=C4Connect;
    &OLDmodnote($dbh,$bibitemnum,$note);
-   $dbh->disconnect;
  }
  
--- 1621,1634 ----
  sub modbibitem {
      my ($biblioitem) = @_;
!     my $dbh   = C4::Context->dbh;
      &OLDmodbibitem($dbh,$biblioitem);
      my $MARCbibitem = MARCkoha2marcBiblio($dbh,$biblioitem);
      &MARCmodbiblio($dbh,$biblioitem->{biblionumber},0,$MARCbibitem);
  } # sub modbibitem
  
  sub modnote {
    my ($bibitemnum,$note)address@hidden;
!   my $dbh = C4::Context->dbh;
    &OLDmodnote($dbh,$bibitemnum,$note);
  }
  
***************
*** 1644,1648 ****
  sub newbiblioitem {
    my ($biblioitem) = @_;
!   my $dbh   = C4Connect;
    my $bibitemnum = &OLDnewbiblioitem($dbh,$biblioitem);
  #  print STDERR "bibitemnum : $bibitemnum\n";
--- 1637,1641 ----
  sub newbiblioitem {
    my ($biblioitem) = @_;
!   my $dbh   = C4::Context->dbh;
    my $bibitemnum = &OLDnewbiblioitem($dbh,$biblioitem);
  #  print STDERR "bibitemnum : $bibitemnum\n";
***************
*** 1655,1661 ****
  sub newsubject {
    my ($bibnum)address@hidden;
!   my $dbh=C4Connect;
    &OLDnewsubject($dbh,$bibnum);
-   $dbh->disconnect;
  }
  
--- 1648,1653 ----
  sub newsubject {
    my ($bibnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    &OLDnewsubject($dbh,$bibnum);
  }
  
***************
*** 1664,1675 ****
  sub newsubtitle {
      my ($bibnum, $subtitle) = @_;
!     my $dbh   = C4Connect;
      &OLDnewsubtitle($dbh,$bibnum,$subtitle);
-   $dbh->disconnect;
  }
  
  sub newitems {
    my ($item, @barcodes) = @_;
!   my $dbh   = C4Connect;
    my $errors;
    my $itemnumber;
--- 1656,1666 ----
  sub newsubtitle {
      my ($bibnum, $subtitle) = @_;
!     my $dbh   = C4::Context->dbh;
      &OLDnewsubtitle($dbh,$bibnum,$subtitle);
  }
  
  sub newitems {
    my ($item, @barcodes) = @_;
!   my $dbh   = C4::Context->dbh;
    my $errors;
    my $itemnumber;
***************
*** 1684,1688 ****
  #      print STDERR "MARCmodbiblio called\n";
    }
-   $dbh->disconnect;
    return($errors);
  }
--- 1675,1678 ----
***************
*** 1691,1695 ****
      my ($item) = @_;
  #  my 
($loan,$itemnum,$bibitemnum,$barcode,$notes,$homebranch,$lost,$wthdrawn,$replacement)address@hidden;
!     my $dbh=C4Connect;
      &OLDmoditem($dbh,$item);
      warn "biblionumber : $item->{'biblionumber'} / $item->{'itemnum'}\n";
--- 1681,1685 ----
      my ($item) = @_;
  #  my 
($loan,$itemnum,$bibitemnum,$barcode,$notes,$homebranch,$lost,$wthdrawn,$replacement)address@hidden;
!     my $dbh = C4::Context->dbh;
      &OLDmoditem($dbh,$item);
      warn "biblionumber : $item->{'biblionumber'} / $item->{'itemnum'}\n";
***************
*** 1700,1709 ****
      my $bibid = 
&MARCfind_MARCbibid_from_oldbiblionumber($dbh,$item->{biblionumber});
      &MARCmoditem($dbh,$MARCitem,$bibid,$item->{itemnum},0);
-     $dbh->disconnect;
  }
  
  sub checkitems{
    my ($count,@barcodes)address@hidden;
!   my $dbh=C4Connect;
    my $error;
    for (my $i=0;$i<$count;$i++){
--- 1690,1698 ----
      my $bibid = 
&MARCfind_MARCbibid_from_oldbiblionumber($dbh,$item->{biblionumber});
      &MARCmoditem($dbh,$MARCitem,$bibid,$item->{itemnum},0);
  }
  
  sub checkitems{
    my ($count,@barcodes)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $error;
    for (my $i=0;$i<$count;$i++){
***************
*** 1717,1721 ****
      $sth->finish;
    }
-   $dbh->disconnect;
    return($error);
  }
--- 1706,1709 ----
***************
*** 1723,1727 ****
  sub countitems{
    my ($bibitemnum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select count(*) from items where biblioitemnumber='$bibitemnum'";
    my $sth=$dbh->prepare($query);
--- 1711,1715 ----
  sub countitems{
    my ($bibitemnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select count(*) from items where biblioitemnumber='$bibitemnum'";
    my $sth=$dbh->prepare($query);
***************
*** 1729,1733 ****
    my $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data->{'count(*)'});
  }
--- 1717,1720 ----
***************
*** 1737,1750 ****
  sub delitem{
    my ($itemnum)address@hidden;
!   my $dbh=C4Connect;
    &OLDdelitem($dbh,$itemnum);
-   $dbh->disconnect;
  }
  
  sub deletebiblioitem {
      my ($biblioitemnumber) = @_;
!     my $dbh   = C4Connect;
      &OLDdeletebiblioitem($dbh,$biblioitemnumber);
-     $dbh->disconnect;
  } # sub deletebiblioitem
  
--- 1724,1735 ----
  sub delitem{
    my ($itemnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    &OLDdelitem($dbh,$itemnum);
  }
  
  sub deletebiblioitem {
      my ($biblioitemnumber) = @_;
!     my $dbh   = C4::Context->dbh;
      &OLDdeletebiblioitem($dbh,$biblioitemnumber);
  } # sub deletebiblioitem
  
***************
*** 1752,1762 ****
  sub delbiblio {
    my ($biblio)address@hidden;
!   my $dbh=C4Connect;
    &OLDdelbiblio($dbh,$biblio);
-   $dbh->disconnect;
  }
  
  sub getitemtypes {
!   my $dbh   = C4Connect;
    my $query = "select * from itemtypes";
    my $sth   = $dbh->prepare($query);
--- 1737,1746 ----
  sub delbiblio {
    my ($biblio)address@hidden;
!   my $dbh = C4::Context->dbh;
    &OLDdelbiblio($dbh,$biblio);
  }
  
  sub getitemtypes {
!   my $dbh   = C4::Context->dbh;
    my $query = "select * from itemtypes";
    my $sth   = $dbh->prepare($query);
***************
*** 1773,1777 ****
    
    $sth->finish;
-   $dbh->disconnect;
    return($count, @results);
  } # sub getitemtypes
--- 1757,1760 ----
***************
*** 1779,1783 ****
  sub getbiblio {
      my ($biblionumber) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select * from biblio where biblionumber = $biblionumber";
      my $sth   = $dbh->prepare($query);
--- 1762,1766 ----
  sub getbiblio {
      my ($biblionumber) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from biblio where biblionumber = $biblionumber";
      my $sth   = $dbh->prepare($query);
***************
*** 1794,1798 ****
      
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub getbiblio
--- 1777,1780 ----
***************
*** 1800,1804 ****
  sub getbiblioitem {
      my ($biblioitemnum) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select * from biblioitems where
  biblioitemnumber = $biblioitemnum";
--- 1782,1786 ----
  sub getbiblioitem {
      my ($biblioitemnum) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from biblioitems where
  biblioitemnumber = $biblioitemnum";
***************
*** 1815,1819 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub getbiblioitem
--- 1797,1800 ----
***************
*** 1821,1825 ****
  sub getbiblioitembybiblionumber {
      my ($biblionumber) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select * from biblioitems where biblionumber =
  $biblionumber";
--- 1802,1806 ----
  sub getbiblioitembybiblionumber {
      my ($biblionumber) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from biblioitems where biblionumber =
  $biblionumber";
***************
*** 1836,1840 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub
--- 1817,1820 ----
***************
*** 1842,1846 ****
  sub getitemsbybiblioitem {
      my ($biblioitemnum) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select * from items, biblio where
  biblio.biblionumber = items.biblionumber and biblioitemnumber
--- 1822,1826 ----
  sub getitemsbybiblioitem {
      my ($biblioitemnum) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from items, biblio where
  biblio.biblionumber = items.biblionumber and biblioitemnumber
***************
*** 1859,1863 ****
      
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub getitemsbybiblioitem
--- 1839,1842 ----
***************
*** 1865,1869 ****
  sub isbnsearch {
      my ($isbn) = @_;
!     my $dbh   = C4Connect;
      my $count = 0;
      my $query;
--- 1844,1848 ----
  sub isbnsearch {
      my ($isbn) = @_;
!     my $dbh   = C4::Context->dbh;
      my $count = 0;
      my $query;
***************
*** 1884,1888 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub isbnsearch
--- 1863,1866 ----
***************
*** 2013,2017 ****
  sub OLD_MAYBE_DELETED_newBiblioItem {
      my ($env, $biblioitem) = @_;
!     my $dbh=&C4Connect;  
      my $biblionumber=$biblioitem->{'biblionumber'};
      my $biblioitemnumber=$biblioitem->{'biblioitemnumber'};
--- 1991,1995 ----
  sub OLD_MAYBE_DELETED_newBiblioItem {
      my ($env, $biblioitem) = @_;
!     my $dbh = C4::Context->dbh
      my $biblionumber=$biblioitem->{'biblionumber'};
      my $biblioitemnumber=$biblioitem->{'biblioitemnumber'};
***************
*** 2267,2271 ****
      }
      $sth->finish;
-     $dbh->disconnect;
      return ($env, $Record_ID);
  }
--- 2245,2248 ----
***************
*** 2273,2277 ****
  sub OLD_MAYBE_DELETED_newItem {
      my ($env, $Record_ID, $item) = @_;
!     my $dbh=&C4Connect;  
      my $barcode=$item->{'barcode'};
      my $q_barcode=$dbh->quote($barcode);
--- 2250,2254 ----
  sub OLD_MAYBE_DELETED_newItem {
      my ($env, $Record_ID, $item) = @_;
!     my $dbh = C4::Context->dbh
      my $barcode=$item->{'barcode'};
      my $q_barcode=$dbh->quote($barcode);
***************
*** 2376,2380 ****
      my $Record_ID;
      my $biblionumber=$biblio->{'biblionumber'};
!     my $dbh=&C4Connect;  
      my $sth=$dbh->prepare("select * from biblio where 
biblionumber=$biblionumber");
      $sth->execute;
--- 2353,2357 ----
      my $Record_ID;
      my $biblionumber=$biblio->{'biblionumber'};
!     my $dbh = C4::Context->dbh
      my $sth=$dbh->prepare("select * from biblio where 
biblionumber=$biblionumber");
      $sth->execute;
***************
*** 2524,2528 ****
  
      my ($env, $biblioitem) = @_;
!     my $dbh=&C4Connect;  
  
      my $biblioitemnumber=$biblioitem->{'biblioitemnumber'};
--- 2501,2505 ----
  
      my ($env, $biblioitem) = @_;
!     my $dbh = C4::Context->dbh
  
      my $biblioitemnumber=$biblioitem->{'biblioitemnumber'};
***************
*** 2644,2649 ****
      }
      $sth->finish;
-     $dbh->disconnect;
- 
  }
  
--- 2621,2624 ----
***************
*** 2657,2661 ****
  
      my ($env, $item) = @_;
!     my $dbh=&C4Connect;  
      my $itemnumber=$item->{'itemnumber'};
      my $biblionumber=$item->{'biblionumber'};
--- 2632,2636 ----
  
      my ($env, $item) = @_;
!     my $dbh = C4::Context->dbh
      my $itemnumber=$item->{'itemnumber'};
      my $biblionumber=$item->{'biblionumber'};
***************
*** 2798,2802 ****
      }
      $sth->finish;
-     $dbh->disconnect;
  }
  
--- 2773,2776 ----