[Koha-cvs] CVS: koha/admin stopwords.pl,1.5,1.6

[Andrew Arensburger]

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

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


Index: stopwords.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/stopwords.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** stopwords.pl        14 Aug 2002 18:12:53 -0000      1.5
--- stopwords.pl        5 Oct 2002 10:03:21 -0000       1.6
***************
*** 39,50 ****
  
  use strict;
- use C4::Output;
  use CGI;
  use C4::Search;
- use C4::Database;
  
  sub StringSearch  {
        my ($env,$searchstring,$type)address@hidden;
!       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)address@hidden;
!       my $dbh = C4::Context->dbh;
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
***************
*** 61,65 ****
        #  $sth->execute;
        $sth->finish;
-       $dbh->disconnect;
        return ($cnt,address@hidden);
  }
--- 61,64 ----
***************
*** 88,92 ****
        my $data;
        if ($searchfield) {
!               my $dbh = &C4Connect;
                my $sth=$dbh->prepare("select word from stopwords where 
word='$searchfield'");
                $sth->execute;
--- 87,91 ----
        my $data;
        if ($searchfield) {
!               my $dbh = C4::Context->dbh;
                my $sth=$dbh->prepare("select word from stopwords where 
word='$searchfield'");
                $sth->execute;
***************
*** 168,172 ****
  # called by add_form, used to insert/modify data in DB
  } elsif ($op eq 'add_validate') {
!       my $dbh=C4Connect;
        my $query = "replace stopwords (word) values (";
        $query.= $dbh->quote($input->param('word')).")";
--- 167,171 ----
  # called by add_form, used to insert/modify data in DB
  } elsif ($op eq 'add_validate') {
!       my $dbh = C4::Context->dbh;
        my $query = "replace stopwords (word) values (";
        $query.= $dbh->quote($input->param('word')).")";
***************
*** 182,186 ****
  # called by default form, used to confirm deletion of data in DB
  } elsif ($op eq 'delete_confirm') {
!       my $dbh = &C4Connect;
        my $sth=$dbh->prepare($reqsel);
        $sth->execute;
--- 181,185 ----
  # 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($reqsel);
        $sth->execute;
***************
*** 196,200 ****
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
!       my $dbh=C4Connect;
  #     my $searchfield=$input->param('branchcode');
        my $sth=$dbh->prepare($reqdel);
--- 195,199 ----
  # called by delete_confirm, used to effectively confirm deletion of data in DB
  } elsif ($op eq 'delete_confirmed') {
!       my $dbh = C4::Context->dbh;
  #     my $searchfield=$input->param('branchcode');
        my $sth=$dbh->prepare($reqdel);