[Koha-cvs] CVS: koha/admin categorie.pl,1.3,1.3.2.1

[Andrew Arensburger]

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

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


Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** categorie.pl	14 Aug 2002 18:12:53 -0000	1.3
--- categorie.pl	4 Oct 2002 02:34:16 -0000	1.3.2.1
***************
*** 38,49 ****
  
  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);
--- 38,49 ----
  
  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);
***************
*** 60,64 ****
  	#  $sth->execute;
  	$sth->finish;
- 	$dbh->disconnect;
  	return ($cnt,\@results);
  }
--- 60,63 ----
***************
*** 81,85 ****
  	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;
--- 80,84 ----
  	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;
***************
*** 179,183 ****
  # 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')).",";
--- 178,182 ----
  # 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')).",";
***************
*** 203,207 ****
  # 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;
--- 202,206 ----
  # 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;
***************
*** 237,241 ****
  # 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'";
--- 236,240 ----
  # 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'";