[Koha-cvs] CVS: koha/C4 Catalogue.pm,1.23,1.23.2.1
Andrew Arensburger
arensb at users.sourceforge.net
Fri Oct 4 04:25:03 CEST 2002
Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv18575
Modified Files:
Tag: arensb-context
Catalogue.pm
Log Message:
Use C4::Connect instead of C4::Database, C4::Connect->dbh instead
C4Connect.
Index: Catalogue.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Catalogue.pm,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** Catalogue.pm 1 Oct 2002 11:50:52 -0000 1.23
--- Catalogue.pm 4 Oct 2002 02:25:01 -0000 1.23.2.1
***************
*** 30,34 ****
use strict;
require Exporter;
! use C4::Database;
use MARC::Record;
use C4::Biblio;
--- 30,34 ----
use strict;
require Exporter;
! use C4::Context;
use MARC::Record;
use C4::Biblio;
***************
*** 138,142 ****
sub basket {
my ($basketno,$supplier)=@_;
! my $dbh=C4Connect;
my $query="Select *,biblio.title from aqorders,biblio,biblioitems
where basketno='$basketno'
--- 138,142 ----
sub basket {
my ($basketno,$supplier)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select *,biblio.title from aqorders,biblio,biblioitems
where basketno='$basketno'
***************
*** 159,163 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 159,162 ----
***************
*** 182,186 ****
# remove out-of-date dummy orders.
sub newbasket {
! my $dbh=C4Connect;
my $query="Select max(basketno) from aqorders";
my $sth=$dbh->prepare($query);
--- 181,185 ----
# remove out-of-date dummy orders.
sub newbasket {
! my $dbh = C4::Context->dbh;
my $query="Select max(basketno) from aqorders";
my $sth=$dbh->prepare($query);
***************
*** 190,194 ****
$basket++;
$sth->finish;
- $dbh->disconnect;
return($basket);
}
--- 189,192 ----
***************
*** 229,233 ****
$sub=0;
}
! my $dbh=C4Connect;
my $query="insert into aqorders (biblionumber,title,basketno,
quantity,listprice,booksellerid,entrydate,requisitionedby,authorisedby,notes,
--- 227,231 ----
$sub=0;
}
! my $dbh = C4::Context->dbh;
my $query="insert into aqorders (biblionumber,title,basketno,
quantity,listprice,booksellerid,entrydate,requisitionedby,authorisedby,notes,
***************
*** 255,259 ****
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 253,256 ----
***************
*** 274,278 ****
sub delorder {
my ($bibnum,$ordnum)=@_;
! my $dbh=C4Connect;
my $query="update aqorders set datecancellationprinted=now()
where biblionumber='$bibnum' and
--- 271,275 ----
sub delorder {
my ($bibnum,$ordnum)=@_;
! my $dbh = C4::Context->dbh;
my $query="update aqorders set datecancellationprinted=now()
where biblionumber='$bibnum' and
***************
*** 287,291 ****
# C4::Acquisitions::delbiblio
}
- $dbh->disconnect;
}
--- 284,287 ----
***************
*** 310,314 ****
sub modorder {
my ($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice)=@_;
! my $dbh=C4Connect;
my $query="update aqorders set title='$title',
quantity='$quantity',listprice='$listprice',basketno='$basketno',
--- 306,310 ----
sub modorder {
my ($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$invoice)=@_;
! my $dbh = C4::Context->dbh;
my $query="update aqorders set title='$title',
quantity='$quantity',listprice='$listprice',basketno='$basketno',
***************
*** 327,331 ****
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 323,326 ----
***************
*** 341,345 ****
# FIXME - Race condition
sub newordernum {
! my $dbh=C4Connect;
my $query="Select max(ordernumber) from aqorders";
my $sth=$dbh->prepare($query);
--- 336,340 ----
# FIXME - Race condition
sub newordernum {
! my $dbh = C4::Context->dbh;
my $query="Select max(ordernumber) from aqorders";
my $sth=$dbh->prepare($query);
***************
*** 349,353 ****
$ordnum++;
$sth->finish;
- $dbh->disconnect;
return($ordnum);
}
--- 344,347 ----
***************
*** 372,376 ****
sub receiveorder {
my ($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund,$rrp)=@_;
! my $dbh=C4Connect;
my $query="update aqorders set quantityreceived='$quantrec',
datereceived=now(),booksellerinvoicenumber='$invoiceno',
--- 366,370 ----
sub receiveorder {
my ($biblio,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund,$rrp)=@_;
! my $dbh = C4::Context->dbh;
my $query="update aqorders set quantityreceived='$quantrec',
datereceived=now(),booksellerinvoicenumber='$invoiceno',
***************
*** 389,393 ****
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 383,386 ----
***************
*** 408,412 ****
sub updaterecorder{
my($biblio,$ordnum,$user,$cost,$bookfund,$rrp)=@_;
! my $dbh=C4Connect;
my $query="update aqorders set
unitprice='$cost', rrp='$rrp'
--- 401,405 ----
sub updaterecorder{
my($biblio,$ordnum,$user,$cost,$bookfund,$rrp)=@_;
! my $dbh = C4::Context->dbh;
my $query="update aqorders set
unitprice='$cost', rrp='$rrp'
***************
*** 423,427 ****
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 416,419 ----
***************
*** 467,471 ****
sub getorders {
my ($supplierid)=@_;
! my $dbh=C4Connect;
my $query = "Select count(*),authorisedby,entrydate,basketno from aqorders where
booksellerid='$supplierid' and (quantity > quantityreceived or
--- 459,463 ----
sub getorders {
my ($supplierid)=@_;
! my $dbh = C4::Context->dbh;
my $query = "Select count(*),authorisedby,entrydate,basketno from aqorders where
booksellerid='$supplierid' and (quantity > quantityreceived or
***************
*** 483,487 ****
}
$sth->finish;
- $dbh->disconnect;
return ($i,\@results);
}
--- 475,478 ----
***************
*** 502,506 ****
sub getorder{
my ($bi,$bib)=@_;
! my $dbh=C4Connect;
my $query="Select ordernumber from aqorders where biblionumber=$bib and
biblioitemnumber='$bi'";
--- 493,497 ----
sub getorder{
my ($bi,$bib)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select ordernumber from aqorders where biblionumber=$bib and
biblioitemnumber='$bi'";
***************
*** 512,516 ****
$sth->finish;
my $order=getsingleorder($ordnum->{'ordernumber'});
- $dbh->disconnect;
# print $query;
return ($order,$ordnum->{'ordernumber'});
--- 503,506 ----
***************
*** 534,538 ****
sub getsingleorder {
my ($ordnum)=@_;
! my $dbh=C4Connect;
my $query="Select * from biblio,biblioitems,aqorders,aqorderbreakdown
where aqorders.ordernumber='$ordnum'
--- 524,528 ----
sub getsingleorder {
my ($ordnum)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from biblio,biblioitems,aqorders,aqorderbreakdown
where aqorders.ordernumber='$ordnum'
***************
*** 544,548 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
return($data);
}
--- 534,537 ----
***************
*** 566,570 ****
#gets all orders from a certain supplier, orders them alphabetically
my ($supid)=@_;
! my $dbh=C4Connect;
my $query="Select * from aqorders,biblio,biblioitems where booksellerid='$supid'
and (cancelledby is NULL or cancelledby = '')
--- 555,559 ----
#gets all orders from a certain supplier, orders them alphabetically
my ($supid)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from aqorders,biblio,biblioitems where booksellerid='$supid'
and (cancelledby is NULL or cancelledby = '')
***************
*** 584,588 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 573,576 ----
***************
*** 592,596 ****
#gets all orders from a certain supplier, orders them alphabetically
my ($supid)=@_;
! my $dbh=C4Connect;
my $query="Select * from aqorders,biblio,biblioitems where booksellerid='$supid'
and (cancelledby is NULL or cancelledby = '')
--- 580,584 ----
#gets all orders from a certain supplier, orders them alphabetically
my ($supid)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from aqorders,biblio,biblioitems where booksellerid='$supid'
and (cancelledby is NULL or cancelledby = '')
***************
*** 611,615 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 599,602 ----
***************
*** 652,656 ****
sub ordersearch {
my ($search,$biblio,$catview) = @_;
! my $dbh = C4Connect;
my $query = "Select *,biblio.title from aqorders,biblioitems,biblio
where aqorders.biblioitemnumber = biblioitems.biblioitemnumber
--- 639,643 ----
sub ordersearch {
my ($search,$biblio,$catview) = @_;
! my $dbh = C4::Context->dbh;
my $query = "Select *,biblio.title from aqorders,biblioitems,biblio
where aqorders.biblioitemnumber = biblioitems.biblioitemnumber
***************
*** 696,700 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 683,686 ----
***************
*** 720,724 ****
sub invoice {
my ($invoice)=@_;
! my $dbh=C4Connect;
my $query="Select * from aqorders,biblio,biblioitems where
booksellerinvoicenumber='$invoice'
--- 706,710 ----
sub invoice {
my ($invoice)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from aqorders,biblio,biblioitems where
booksellerinvoicenumber='$invoice'
***************
*** 734,738 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 720,723 ----
***************
*** 752,756 ****
#'
sub bookfunds {
! my $dbh=C4Connect;
my $query="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
=aqbudget.bookfundid
--- 737,741 ----
#'
sub bookfunds {
! my $dbh = C4::Context->dbh;
my $query="Select * from aqbookfund,aqbudget where aqbookfund.bookfundid
=aqbudget.bookfundid
***************
*** 765,769 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 750,753 ----
***************
*** 773,777 ****
sub bookfundbreakdown {
my ($id)=@_;
! my $dbh=C4Connect;
my $query="Select quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived,subscription
from aqorders,aqorderbreakdown where bookfundid='$id' and
--- 757,761 ----
sub bookfundbreakdown {
my ($id)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select quantity,datereceived,freight,unitprice,listprice,ecost,quantityreceived,subscription
from aqorders,aqorderbreakdown where bookfundid='$id' and
***************
*** 793,797 ****
}
$sth->finish;
- $dbh->disconnect;
return($spent,$comtd);
}
--- 777,780 ----
***************
*** 811,815 ****
sub curconvert {
my ($currency,$price)=@_;
! my $dbh=C4Connect;
my $query="Select rate from currency where currency='$currency'";
my $sth=$dbh->prepare($query);
--- 794,798 ----
sub curconvert {
my ($currency,$price)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select rate from currency where currency='$currency'";
my $sth=$dbh->prepare($query);
***************
*** 817,827 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
my $cur=$data->{'rate'};
if ($cur==0){
$cur=1;
}
! my $price=$price / $cur;
! return($price);
}
--- 800,808 ----
my $data=$sth->fetchrow_hashref;
$sth->finish;
my $cur=$data->{'rate'};
if ($cur==0){
$cur=1;
}
! return($price / $cur);
}
***************
*** 839,843 ****
#'
sub getcurrencies {
! my $dbh=C4Connect;
my $query="Select * from currency";
my $sth=$dbh->prepare($query);
--- 820,824 ----
#'
sub getcurrencies {
! my $dbh = C4::Context->dbh;
my $query="Select * from currency";
my $sth=$dbh->prepare($query);
***************
*** 850,854 ****
}
$sth->finish;
- $dbh->disconnect;
return($i,\@results);
}
--- 831,834 ----
***************
*** 857,861 ****
sub getcurrency {
my ($cur)=@_;
! my $dbh=C4Connect;
my $query="Select * from currency where currency='$cur'";
my $sth=$dbh->prepare($query);
--- 837,841 ----
sub getcurrency {
my ($cur)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from currency where currency='$cur'";
my $sth=$dbh->prepare($query);
***************
*** 864,868 ****
my $data=$sth->fetchrow_hashref;
$sth->finish;
- $dbh->disconnect;
return($data);
}
--- 844,847 ----
***************
*** 878,887 ****
sub updatecurrencies {
my ($currency,$rate)=@_;
! my $dbh=C4Connect;
my $query="update currency set rate=$rate where currency='$currency'";
my $sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 857,865 ----
sub updatecurrencies {
my ($currency,$rate)=@_;
! my $dbh = C4::Context->dbh;
my $query="update currency set rate=$rate where currency='$currency'";
my $sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;
}
***************
*** 890,894 ****
sub updatecost{
my($price,$rrp,$itemnum)=@_;
! my $dbh=C4Connect;
my $query="update items set price='$price',replacementprice='$rrp'
where itemnumber=$itemnum";
--- 868,872 ----
sub updatecost{
my($price,$rrp,$itemnum)=@_;
! my $dbh = C4::Context->dbh;
my $query="update items set price='$price',replacementprice='$rrp'
where itemnumber=$itemnum";
***************
*** 896,900 ****
$sth->execute;
$sth->finish;
- $dbh->disconnect;
}
--- 874,877 ----
***************
*** 920,924 ****
sub bookseller {
my ($searchstring)=@_;
! my $dbh=C4Connect;
my $query="Select * from aqbooksellers where name like '%$searchstring%' or
id = '$searchstring'";
--- 897,901 ----
sub bookseller {
my ($searchstring)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from aqbooksellers where name like '%$searchstring%' or
id = '$searchstring'";
***************
*** 932,936 ****
}
$sth->finish;
- $dbh->disconnect;
return($i, at results);
}
--- 909,912 ----
***************
*** 950,954 ****
sub breakdown {
my ($id)=@_;
! my $dbh=C4Connect;
my $query="Select * from aqorderbreakdown where ordernumber='$id'";
my $sth=$dbh->prepare($query);
--- 926,930 ----
sub breakdown {
my ($id)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from aqorderbreakdown where ordernumber='$id'";
my $sth=$dbh->prepare($query);
***************
*** 961,965 ****
}
$sth->finish;
- $dbh->disconnect;
return($i,\@results);
}
--- 937,940 ----
***************
*** 978,982 ****
#'
sub branches {
! my $dbh = C4Connect;
my $query = "Select * from branches";
my $sth = $dbh->prepare($query);
--- 953,957 ----
#'
sub branches {
! my $dbh = C4::Context->dbh;
my $query = "Select * from branches";
my $sth = $dbh->prepare($query);
***************
*** 991,995 ****
$sth->finish;
- $dbh->disconnect;
return($i, @results);
} # sub branches
--- 966,969 ----
***************
*** 998,1002 ****
sub findall {
my ($biblionumber)=@_;
! my $dbh=C4Connect;
my $query="Select * from biblioitems,items,itemtypes where
biblioitems.biblionumber=$biblionumber
--- 972,976 ----
sub findall {
my ($biblionumber)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from biblioitems,items,itemtypes where
biblioitems.biblionumber=$biblionumber
***************
*** 1013,1017 ****
}
$sth->finish;
- $dbh->disconnect;
return(@results);
}
--- 987,990 ----
***************
*** 1020,1024 ****
sub needsmod{
my ($bibitemnum,$itemtype)=@_;
! my $dbh=C4Connect;
my $query="Select * from biblioitems where biblioitemnumber=$bibitemnum
and itemtype='$itemtype'";
--- 993,997 ----
sub needsmod{
my ($bibitemnum,$itemtype)=@_;
! my $dbh = C4::Context->dbh;
my $query="Select * from biblioitems where biblioitemnumber=$bibitemnum
and itemtype='$itemtype'";
***************
*** 1030,1034 ****
}
$sth->finish;
- $dbh->disconnect;
return($result);
}
--- 1003,1006 ----
***************
*** 1051,1055 ****
sub updatesup {
my ($data)=@_;
! my $dbh=C4Connect;
my $query="Update aqbooksellers set
name='$data->{'name'}',address1='$data->{'address1'}',address2='$data->{'address2'}',
--- 1023,1027 ----
sub updatesup {
my ($data)=@_;
! my $dbh = C4::Context->dbh;
my $query="Update aqbooksellers set
name='$data->{'name'}',address1='$data->{'address1'}',address2='$data->{'address2'}',
***************
*** 1069,1073 ****
$sth->execute;
$sth->finish;
- $dbh->disconnect;
# print $query;
}
--- 1041,1044 ----
***************
*** 1087,1091 ****
sub insertsup {
my ($data)=@_;
! my $dbh=C4Connect;
my $sth=$dbh->prepare("Select max(id) from aqbooksellers");
$sth->execute;
--- 1058,1062 ----
sub insertsup {
my ($data)=@_;
! my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare("Select max(id) from aqbooksellers");
$sth->execute;
***************
*** 1097,1101 ****
$sth->finish;
$data->{'id'}=$data2->{'max(id)'};
- $dbh->disconnect;
updatesup($data);
return($data->{'id'});
--- 1068,1071 ----
***************
*** 1120,1124 ****
sub websitesearch {
my ($keywordlist) = @_;
! my $dbh = C4Connect;
my $query = "Select distinct biblio.* from biblio, biblioitems where
biblio.biblionumber = biblioitems.biblionumber and (";
--- 1090,1094 ----
sub websitesearch {
my ($keywordlist) = @_;
! my $dbh = C4::Context->dbh;
my $query = "Select distinct biblio.* from biblio, biblioitems where
biblio.biblionumber = biblioitems.biblionumber and (";
***************
*** 1157,1161 ****
$sth->finish;
- $dbh->disconnect;
return($count, @results);
} # sub websitesearch
--- 1127,1130 ----
***************
*** 1173,1177 ****
sub addwebsite {
my ($website) = @_;
! my $dbh = C4Connect;
my $query;
--- 1142,1146 ----
sub addwebsite {
my ($website) = @_;
! my $dbh = C4::Context->dbh;
my $query;
***************
*** 1195,1200 ****
$dbh->do($query);
-
- $dbh->disconnect;
} # sub website
--- 1164,1167 ----
***************
*** 1212,1216 ****
sub updatewebsite {
my ($website) = @_;
! my $dbh = C4Connect;
my $query;
--- 1179,1183 ----
sub updatewebsite {
my ($website) = @_;
! my $dbh = C4::Context->dbh;
my $query;
***************
*** 1226,1231 ****
$dbh->do($query);
-
- $dbh->disconnect;
} # sub updatewebsite
--- 1193,1196 ----
***************
*** 1240,1249 ****
sub deletewebsite {
my ($websitenumber) = @_;
! my $dbh = C4Connect;
my $query = "Delete from websites where websitenumber = $websitenumber";
$dbh->do($query);
-
- $dbh->disconnect;
} # sub deletewebsite
--- 1205,1213 ----
sub deletewebsite {
my ($websitenumber) = @_;
! my $dbh = C4::Context->dbh;
! # FIXME - $query is unneeded
my $query = "Delete from websites where websitenumber = $websitenumber";
$dbh->do($query);
} # sub deletewebsite
More information about the Koha-cvs
mailing list