[Koha-cvs] CVS: koha/C4 Search.pm,1.39,1.39.2.1

[Andrew Arensburger]

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

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


Index: Search.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Search.pm,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -C2 -r1.39 -r1.39.2.1
*** Search.pm   22 Sep 2002 16:51:11 -0000      1.39
--- Search.pm   4 Oct 2002 02:26:20 -0000       1.39.2.1
***************
*** 22,26 ****
  require Exporter;
  use DBI;
! use C4::Database;
  use C4::Reserves2;
  use Set::Scalar;
--- 22,26 ----
  require Exporter;
  use DBI;
! use C4::Context;
  use C4::Reserves2;
  use Set::Scalar;
***************
*** 82,86 ****
  sub findguarantees{
    my ($bornum)address@hidden;
!   my $dbh=C4Connect;
    my $query="select cardnumber,borrowernumber from borrowers where
    guarantor='$bornum'";
--- 82,86 ----
  sub findguarantees{
    my ($bornum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="select cardnumber,borrowernumber from borrowers where
    guarantor='$bornum'";
***************
*** 94,98 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return($i,address@hidden);
  }
--- 94,97 ----
***************
*** 116,120 ****
  sub findguarantor{
    my ($bornum)address@hidden;
!   my $dbh=C4Connect;
    my $query="select guarantor from borrowers where
    borrowernumber='$bornum'";
--- 115,119 ----
  sub findguarantor{
    my ($bornum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="select guarantor from borrowers where
    borrowernumber='$bornum'";
***************
*** 129,133 ****
    $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data);
  }
--- 128,131 ----
***************
*** 144,148 ****
  sub systemprefs {
      my %systemprefs;
!     my $dbh=C4Connect;
      my $sth=$dbh->prepare("select variable,value from systempreferences");
      $sth->execute;
--- 142,146 ----
  sub systemprefs {
      my %systemprefs;
!     my $dbh = C4::Context->dbh;
      my $sth=$dbh->prepare("select variable,value from systempreferences");
      $sth->execute;
***************
*** 151,155 ****
      }
      $sth->finish;
-     $dbh->disconnect;
      return(%systemprefs);
  }
--- 149,152 ----
***************
*** 164,168 ****
  #'
  sub NewBorrowerNumber {
!   my $dbh=C4Connect;
    my $sth=$dbh->prepare("Select max(borrowernumber) from borrowers");
    $sth->execute;
--- 161,165 ----
  #'
  sub NewBorrowerNumber {
!   my $dbh = C4::Context->dbh;
    my $sth=$dbh->prepare("Select max(borrowernumber) from borrowers");
    $sth->execute;
***************
*** 170,174 ****
    $sth->finish;
    $data->{'max(borrowernumber)'}++;
-   $dbh->disconnect;
    return($data->{'max(borrowernumber)'});
  }
--- 167,170 ----
***************
*** 216,220 ****
  sub catalogsearch {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = C4Connect();
  #  foreach my $key (%$search){
  #    $search->{$key}=$dbh->quote($search->{$key});
--- 212,216 ----
  sub catalogsearch {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = C4::Context->dbh;
  #  foreach my $key (%$search){
  #    $search->{$key}=$dbh->quote($search->{$key});
***************
*** 331,335 ****
  sub KeywordSearch {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = &C4Connect;
    $search->{'keyword'}=~ s/ +$//;
    $search->{'keyword'}=~ s/'/\\'/;
--- 327,331 ----
  sub KeywordSearch {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = C4::Context->dbh;
    $search->{'keyword'}=~ s/ +$//;
    $search->{'keyword'}=~ s/'/\\'/;
***************
*** 553,557 ****
    }
    }
-   $dbh->disconnect;
  
    #$count=$i;
--- 549,552 ----
***************
*** 561,565 ****
  sub KeywordSearch2 {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = &C4Connect;
    $search->{'keyword'}=~ s/ +$//;
    $search->{'keyword'}=~ s/'/\\'/;
--- 556,560 ----
  sub KeywordSearch2 {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = C4::Context->dbh;
    $search->{'keyword'}=~ s/ +$//;
    $search->{'keyword'}=~ s/'/\\'/;
***************
*** 703,707 ****
    }
    $sth->finish;
-   $dbh->disconnect;
  #  $i--;
  #  $i++;
--- 698,701 ----
***************
*** 866,870 ****
  sub CatSearch  {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = &C4Connect;
    my $query = '';
      my @results;
--- 860,864 ----
  sub CatSearch  {
    my ($env,$type,$search,$num,$offset)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query = '';
      my @results;
***************
*** 1069,1072 ****
--- 1063,1067 ----
           $sth->execute;
           my $data=$sth->fetchrow_hashref;
+               # FIXME - There's already a $data in this scope.
           my ($dewey, $subclass) = ($data->{'dewey'}, $data->{'subclass'});
           # FIXME - The following assumes that the Dewey code is a
***************
*** 1181,1185 ****
  sub subsearch {
    my ($env,$subject)address@hidden;
!   my $dbh=C4Connect();
    $subject=$dbh->quote($subject);
    my $query="Select * from biblio,bibliosubject where
--- 1176,1180 ----
  sub subsearch {
    my ($env,$subject)address@hidden;
!   my $dbh = C4::Context->dbh;
    $subject=$dbh->quote($subject);
    my $query="Select * from biblio,bibliosubject where
***************
*** 1197,1201 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return(@results);
  }
--- 1192,1195 ----
***************
*** 1249,1253 ****
  sub ItemInfo {
      my ($env,$biblionumber,$type) = @_;
!     my $dbh   = &C4Connect;
      my $query = "SELECT * FROM items, biblio, biblioitems, itemtypes
                    WHERE items.biblionumber = ?
--- 1243,1247 ----
  sub ItemInfo {
      my ($env,$biblionumber,$type) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "SELECT * FROM items, biblio, biblioitems, itemtypes
                    WHERE items.biblionumber = ?
***************
*** 1349,1353 ****
    $sth2->finish;
  
-   $dbh->disconnect;
    return(@results);
  }
--- 1343,1346 ----
***************
*** 1376,1380 ****
     my ($env,$biblionumber)address@hidden;
     #debug_msg($env,"GetItems");
!    my $dbh = &C4Connect;
     my $query = "Select * from biblioitems where (biblionumber = 
$biblionumber)";
     #debug_msg($env,$query);
--- 1369,1373 ----
     my ($env,$biblionumber)address@hidden;
     #debug_msg($env,"GetItems");
!    my $dbh = C4::Context->dbh;
     my $query = "Select * from biblioitems where (biblionumber = 
$biblionumber)";
     #debug_msg($env,$query);
***************
*** 1409,1413 ****
     }
     $sth->finish;
-    $dbh->disconnect;
     return(@results);
  }
--- 1402,1405 ----
***************
*** 1426,1430 ****
  sub itemdata {
    my ($barcode)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from items,biblioitems where barcode='$barcode'
    and items.biblioitemnumber=biblioitems.biblioitemnumber";
--- 1418,1422 ----
  sub itemdata {
    my ($barcode)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from items,biblioitems where barcode='$barcode'
    and items.biblioitemnumber=biblioitems.biblioitemnumber";
***************
*** 1434,1438 ****
    my $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data);
  }
--- 1426,1429 ----
***************
*** 1460,1464 ****
  sub bibdata {
      my ($bibnum, $type) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select *, biblio.notes
      from biblio, biblioitems
--- 1451,1455 ----
  sub bibdata {
      my ($bibnum, $type) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select *, biblio.notes
      from biblio, biblioitems
***************
*** 1482,1486 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($data);
  } # sub bibdata
--- 1473,1476 ----
***************
*** 1499,1503 ****
  sub bibitemdata {
      my ($bibitem) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select *,biblioitems.notes as bnotes from biblio, 
biblioitems,itemtypes
  where biblio.biblionumber = biblioitems.biblionumber
--- 1489,1493 ----
  sub bibitemdata {
      my ($bibitem) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select *,biblioitems.notes as bnotes from biblio, 
biblioitems,itemtypes
  where biblio.biblionumber = biblioitems.biblionumber
***************
*** 1512,1516 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($data);
  } # sub bibitemdata
--- 1502,1505 ----
***************
*** 1529,1533 ****
  sub subject {
    my ($bibnum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from bibliosubject where biblionumber=$bibnum";
    my $sth=$dbh->prepare($query);
--- 1518,1522 ----
  sub subject {
    my ($bibnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from bibliosubject where biblionumber=$bibnum";
    my $sth=$dbh->prepare($query);
***************
*** 1540,1544 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return($i,address@hidden);
  }
--- 1529,1532 ----
***************
*** 1559,1563 ****
  sub addauthor {
    my ($bibnum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from additionalauthors where biblionumber=$bibnum";
    my $sth=$dbh->prepare($query);
--- 1547,1551 ----
  sub addauthor {
    my ($bibnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from additionalauthors where biblionumber=$bibnum";
    my $sth=$dbh->prepare($query);
***************
*** 1570,1574 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return($i,address@hidden);
  }
--- 1558,1561 ----
***************
*** 1588,1592 ****
  sub subtitle {
    my ($bibnum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from bibliosubtitle where biblionumber=$bibnum";
    my $sth=$dbh->prepare($query);
--- 1575,1579 ----
  sub subtitle {
    my ($bibnum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from bibliosubtitle where biblionumber=$bibnum";
    my $sth=$dbh->prepare($query);
***************
*** 1599,1603 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return($i,address@hidden);
  }
--- 1586,1589 ----
***************
*** 1649,1653 ****
  sub itemissues {
      my ($bibitem, $biblio)address@hidden;
!     my $dbh   = C4Connect;
      my $query = "Select * from items where
  items.biblioitemnumber = '$bibitem'";
--- 1635,1639 ----
  sub itemissues {
      my ($bibitem, $biblio)address@hidden;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from items where
  items.biblioitemnumber = '$bibitem'";
***************
*** 1718,1722 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return(@results);
  }
--- 1704,1707 ----
***************
*** 1738,1742 ****
  sub itemnodata {
    my ($env,$dbh,$itemnumber) = @_;
!   $dbh=C4Connect;
    my $query="Select * from biblio,items,biblioitems
      where items.itemnumber = '$itemnumber'
--- 1723,1727 ----
  sub itemnodata {
    my ($env,$dbh,$itemnumber) = @_;
!   $dbh = C4::Context->dbh;
    my $query="Select * from biblio,items,biblioitems
      where items.itemnumber = '$itemnumber'
***************
*** 1748,1752 ****
    my $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data);
  }
--- 1733,1736 ----
***************
*** 1775,1779 ****
  sub BornameSearch  {
    my ($env,$searchstring,$type)address@hidden;
!   my $dbh = &C4Connect;
    $searchstring=~ s/\'/\\\'/g;
    my @data=split(' ',$searchstring);
--- 1759,1763 ----
  sub BornameSearch  {
    my ($env,$searchstring,$type)address@hidden;
!   my $dbh = C4::Context->dbh;
    $searchstring=~ s/\'/\\\'/g;
    my @data=split(' ',$searchstring);
***************
*** 1802,1806 ****
  #  $sth->execute;
    $sth->finish;
-   $dbh->disconnect;
    return ($cnt,address@hidden);
  }
--- 1786,1789 ----
***************
*** 1822,1826 ****
    my ($cardnumber,$bornum)address@hidden;
    $cardnumber = uc $cardnumber;
!   my $dbh=C4Connect;
    my $query;
    if ($bornum eq ''){
--- 1805,1809 ----
    my ($cardnumber,$bornum)address@hidden;
    $cardnumber = uc $cardnumber;
!   my $dbh = C4::Context->dbh;
    my $query;
    if ($bornum eq ''){
***************
*** 1834,1838 ****
    my $data=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return($data);
  }
--- 1817,1820 ----
***************
*** 1854,1858 ****
  sub borrissues {
    my ($bornum)address@hidden;
!   my $dbh=C4Connect;
    my $query;
    $query="Select * from issues,biblio,items where borrowernumber='$bornum' and
--- 1836,1840 ----
  sub borrissues {
    my ($bornum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query;
    $query="Select * from issues,biblio,items where borrowernumber='$bornum' and
***************
*** 1870,1874 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return($i,address@hidden);
  }
--- 1852,1855 ----
***************
*** 1897,1901 ****
  sub allissues {
    my ($bornum,$order,$limit)address@hidden;
!   my $dbh=C4Connect;
    my $query;
    $query="Select * from issues,biblio,items,biblioitems
--- 1878,1882 ----
  sub allissues {
    my ($bornum,$order,$limit)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query;
    $query="Select * from issues,biblio,items,biblioitems
***************
*** 1918,1922 ****
    }
    $sth->finish;
-   $dbh->disconnect;
    return($i,address@hidden);
  }
--- 1899,1902 ----
***************
*** 1940,1944 ****
  sub borrdata2 {
    my ($env,$bornum)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select count(*) from issues where borrowernumber='$bornum' and
      returndate is NULL";
--- 1920,1924 ----
  sub borrdata2 {
    my ($env,$bornum)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select count(*) from issues where borrowernumber='$bornum' and
      returndate is NULL";
***************
*** 1958,1962 ****
    my $data3=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
  
  
return($data2->{'count(*)'},$data->{'count(*)'},$data3->{'sum(amountoutstanding)'});
--- 1938,1941 ----
***************
*** 1983,1987 ****
  sub getboracctrecord {
     my ($env,$params) = @_;
!    my $dbh=C4Connect;
     my @acctlines;
     my $numlines=0;
--- 1962,1966 ----
  sub getboracctrecord {
     my ($env,$params) = @_;
!    my $dbh = C4::Context->dbh;
     my @acctlines;
     my $numlines=0;
***************
*** 2007,2011 ****
     }
     $sth->finish;
-    $dbh->disconnect;
     return ($numlines,address@hidden,$total);
  }
--- 1986,1989 ----
***************
*** 2053,2057 ****
  sub itemcount {
    my ($env,$bibnum,$type)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from items where
    biblionumber=$bibnum ";
--- 2031,2035 ----
  sub itemcount {
    my ($env,$bibnum,$type)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from items where
    biblionumber=$bibnum ";
***************
*** 2119,2123 ****
      $sth2->finish;
    $sth->finish;
-   $dbh->disconnect;
    return 
($count,$lcount,$nacount,$fcount,$scount,$lostcount,$mending,$transit,$ocount);
  }
--- 2097,2100 ----
***************
*** 2161,2165 ****
  sub itemcount2 {
    my ($env,$bibnum,$type)address@hidden;
!   my $dbh=C4Connect;
    my $query="Select * from items,branches where
    biblionumber=$bibnum and items.holdingbranch=branches.branchcode";
--- 2138,2142 ----
  sub itemcount2 {
    my ($env,$bibnum,$type)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="Select * from items,branches where
    biblionumber=$bibnum and items.holdingbranch=branches.branchcode";
***************
*** 2202,2206 ****
    $sth2->finish;
    $sth->finish;
-   $dbh->disconnect;
    return (\%counts);
  }
--- 2179,2182 ----
***************
*** 2237,2241 ****
  sub ItemType {
    my ($type)address@hidden;
!   my $dbh=C4Connect;
    my $query="select description from itemtypes where itemtype='$type'";
    my $sth=$dbh->prepare($query);
--- 2213,2217 ----
  sub ItemType {
    my ($type)address@hidden;
!   my $dbh = C4::Context->dbh;
    my $query="select description from itemtypes where itemtype='$type'";
    my $sth=$dbh->prepare($query);
***************
*** 2243,2247 ****
    my $dat=$sth->fetchrow_hashref;
    $sth->finish;
-   $dbh->disconnect;
    return ($dat->{'description'});
  }
--- 2219,2222 ----
***************
*** 2267,2271 ****
  sub bibitems {
      my ($bibnum) = @_;
!     my $dbh   = C4Connect;
      my $query = "SELECT biblioitems.*,
                          itemtypes.*,
--- 2242,2246 ----
  sub bibitems {
      my ($bibnum) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "SELECT biblioitems.*,
                          itemtypes.*,
***************
*** 2286,2290 ****
      } # while
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub bibitems
--- 2261,2264 ----
***************
*** 2306,2310 ****
      #called from request.pl
      my ($biblioitemnumber)address@hidden;
!     my $dbh=C4Connect;
      my $query="SELECT barcode, itemlost FROM items
                             WHERE biblioitemnumber = ?
--- 2280,2284 ----
      #called from request.pl
      my ($biblioitemnumber)address@hidden;
!     my $dbh = C4::Context->dbh;
      my $query="SELECT barcode, itemlost FROM items
                             WHERE biblioitemnumber = ?
***************
*** 2319,2323 ****
      }
      $sth->finish;
-     $dbh->disconnect;
      return(@barcodes);
  }
--- 2293,2296 ----
***************
*** 2339,2343 ****
  sub getwebsites {
      my ($biblionumber) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select * from websites where biblionumber = $biblionumber";
      my $sth   = $dbh->prepare($query);
--- 2312,2316 ----
  sub getwebsites {
      my ($biblionumber) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from websites where biblionumber = $biblionumber";
      my $sth   = $dbh->prepare($query);
***************
*** 2359,2363 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub getwebsites
--- 2332,2335 ----
***************
*** 2378,2382 ****
  sub getwebbiblioitems {
      my ($biblionumber) = @_;
!     my $dbh   = C4Connect;
      my $query = "Select * from biblioitems where biblionumber = $biblionumber
  and itemtype = 'WEB'";
--- 2350,2354 ----
  sub getwebbiblioitems {
      my ($biblionumber) = @_;
!     my $dbh   = C4::Context->dbh;
      my $query = "Select * from biblioitems where biblionumber = $biblionumber
  and itemtype = 'WEB'";
***************
*** 2393,2397 ****
  
      $sth->finish;
-     $dbh->disconnect;
      return($count, @results);
  } # sub getwebbiblioitems
--- 2365,2368 ----