[Koha-cvs] CVS: koha/admin categoryitem.pl,1.3,1.4

[Andrew Arensburger]

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26672/admin

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


Index: categoryitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** categoryitem.pl	14 Aug 2002 18:12:53 -0000	1.3
--- categoryitem.pl	5 Oct 2002 10:02:29 -0000	1.4
***************
*** 39,50 ****
  
  use strict;
- use C4::Output;
  use CGI;
  use C4::Search;
- use C4::Database;
  
  sub StringSearch  {
  	my ($env,$searchstring,$type)=@_;
! 	my $dbh = &C4Connect;
  	$searchstring=~ s/\'/\\\'/g;
  	my @data=split(' ',$searchstring);
--- 39,50 ----
  
  use strict;
  use CGI;
+ use C4::Context;
+ use C4::Output;
  use C4::Search;
  
  sub StringSearch  {
  	my ($env,$searchstring,$type)=@_;
! 	my $dbh = C4::Context->dbh;
  	$searchstring=~ s/\'/\\\'/g;
  	my @data=split(' ',$searchstring);
***************
*** 61,65 ****
  	#  $sth->execute;
  	$sth->finish;
- 	$dbh->disconnect;
  	return ($cnt,\@results);
  }
--- 61,64 ----
***************
*** 82,86 ****
  	my $data;
  	if ($categorycode) {
! 		my $dbh = &C4Connect;
  		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired from categories where categorycode='$categorycode'");
  		$sth->execute;
--- 81,85 ----
  	my $data;
  	if ($categorycode) {
! 		my $dbh = C4::Context->dbh;
  		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired from categories where categorycode='$categorycode'");
  		$sth->execute;
***************
*** 180,184 ****
  # called by add_form, used to insert/modify data in DB
  } elsif ($op eq 'add_validate') {
! 	my $dbh=C4Connect;
  	my $query = "replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired) values (";
  	$query.= $dbh->quote($input->param('categorycode')).",";
--- 179,183 ----
  # called by add_form, used to insert/modify data in DB
  } elsif ($op eq 'add_validate') {
! 	my $dbh = C4::Context->dbh;
  	my $query = "replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired) values (";
  	$query.= $dbh->quote($input->param('categorycode')).",";
***************
*** 204,208 ****
  # called by default form, used to confirm deletion of data in DB
  } elsif ($op eq 'delete_confirm') {
! 	my $dbh = &C4Connect;
  	my $sth=$dbh->prepare("select count(*) as total from categoryitem where categorycode='$categorycode'");
  	$sth->execute;
--- 203,207 ----
  # called by default form, used to confirm deletion of data in DB
  } elsif ($op eq 'delete_confirm') {
! 	my $dbh = C4::Context->dbh;
  	my $sth=$dbh->prepare("select count(*) as total from categoryitem where categorycode='$categorycode'");
  	$sth->execute;
***************
*** 210,213 ****
--- 209,213 ----
  	print "TOTAL : $categorycode : $total->{'total'}<br>";
  	$sth->finish;
+ 	# FIXME - There's already a $sth in this scope.
  	my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired from categories where categorycode='$categorycode'");
  	$sth->execute;
***************
*** 238,242 ****
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
! 	my $dbh=C4Connect;
  	my $categorycode=uc($input->param('categorycode'));
  	my $query = "delete from categories where categorycode='$categorycode'";
--- 238,242 ----
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
! 	my $dbh = C4::Context->dbh;
  	my $categorycode=uc($input->param('categorycode'));
  	my $query = "delete from categories where categorycode='$categorycode'";