projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating french translations
[koha.git]
/
admin
/
stopwords.pl
diff --git
a/admin/stopwords.pl
b/admin/stopwords.pl
index
5a1e50d
..
c16a50c
100755
(executable)
--- a/
admin/stopwords.pl
+++ b/
admin/stopwords.pl
@@
-42,26
+42,23
@@
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Context;
use C4::Output;
use C4::Search;
-use HTML::Template;
use C4::Auth;
use C4::Auth;
-use C4::Interface::CGI::Output;
sub StringSearch {
my ($env,$searchstring,$type)=@_;
sub StringSearch {
my ($env,$searchstring,$type)=@_;
- my $dbh = C4::Context->dbh;
$searchstring=~ s/\'/\\\'/g;
my @data=split(' ',$searchstring);
my $count=@data;
$searchstring=~ s/\'/\\\'/g;
my @data=split(' ',$searchstring);
my $count=@data;
- my $query="";
- my $sth=$dbh->prepare("Select word from stopwords where (word like ?) order by word");
+ my $sth = C4::Context->dbh->prepare("
+ SELECT word from stopwords WHERE (word like ?) order by word
+ ");
$sth->execute("$data[0]%");
my @results;
my $cnt=0;
while (my $data=$sth->fetchrow_hashref){
$sth->execute("$data[0]%");
my @results;
my $cnt=0;
while (my $data=$sth->fetchrow_hashref){
- push(@results,$data);
- $cnt ++;
+
push(@results,$data);
+
$cnt ++;
}
}
- # $sth->execute;
$sth->finish;
return ($cnt,\@results);
}
$sth->finish;
return ($cnt,\@results);
}
@@
-77,12
+74,12
@@
$searchfield=~ s/\,//g;
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "admin/stopwords.tmpl",
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "admin/stopwords.tmpl",
-
query => $input,
-
type => "intranet",
-
flagsrequired => {parameters => 1, management => 1},
-
authnotrequired => 0,
-
debug => 1,
-
});
+ query => $input,
+ type => "intranet",
+ flagsrequired => {parameters => 1, management => 1},
+ authnotrequired => 0,
+ debug => 1,
+ });
$template->param(script_name => $script_name,
searchfield => $searchfield);
$template->param(script_name => $script_name,
searchfield => $searchfield);
@@
-93,15
+90,13
@@
$template->param(script_name => $script_name,
if ($op eq 'add_form') {
$template->param(add_form => 1);
#---- if primkey exists, it's a modify action, so read values to modify...
if ($op eq 'add_form') {
$template->param(add_form => 1);
#---- if primkey exists, it's a modify action, so read values to modify...
- my $data;
if ($searchfield) {
my $dbh = C4::Context->dbh;
if ($searchfield) {
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("
select
word from stopwords where word=?");
+ my $sth=$dbh->prepare("
SELECT
word from stopwords where word=?");
$sth->execute($searchfield);
$sth->execute($searchfield);
- $data=$sth->fetchrow_hashref;
+ my $data=$sth->fetchrow_hashref; # why bother ??
$sth->finish;
}
$sth->finish;
}
-
# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
@@
-109,7
+104,7
@@
if ($op eq 'add_form') {
$template->param(add_validate => 1);
my $dbh = C4::Context->dbh;
my @tab = split / |,/, $input->param('word');
$template->param(add_validate => 1);
my $dbh = C4::Context->dbh;
my @tab = split / |,/, $input->param('word');
- my $sth=$dbh->prepare("
replace stopwords (word) values
(?)");
+ my $sth=$dbh->prepare("
INSERT INTO stopwords (word) VALUES
(?)");
foreach my $insert_value (@tab) {
$sth->execute($insert_value);
}
foreach my $insert_value (@tab) {
$sth->execute($insert_value);
}
@@
-120,9
+115,9
@@
if ($op eq 'add_form') {
} elsif ($op eq 'delete_confirm') {
$template->param(delete_confirm => 1);
my $dbh = C4::Context->dbh;
} elsif ($op eq 'delete_confirm') {
$template->param(delete_confirm => 1);
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("
select
word from stopwords where word=?");
+ my $sth=$dbh->prepare("
SELECT
word from stopwords where word=?");
$sth->execute($searchfield);
$sth->execute($searchfield);
- my $data=$sth->fetchrow_hashref;
+ my $data=$sth->fetchrow_hashref;
# why bother ?
$sth->finish;
# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
$sth->finish;
# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
@@
-141,20
+136,12
@@
if ($op eq 'add_form') {
my $env;
my ($count,$results)=StringSearch($env,$searchfield,'web');
my @loop;
my $env;
my ($count,$results)=StringSearch($env,$searchfield,'web');
my @loop;
- my $toggle =
'white'
;
+ my $toggle =
0
;
for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
my %row = (word => $results->[$i]{'word'},
toggle => $toggle);
push @loop, \%row;
for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
my %row = (word => $results->[$i]{'word'},
toggle => $toggle);
push @loop, \%row;
-
- if ( $toggle eq 'white' )
- {
- $toggle = '#ffffcc';
- }
- else
- {
- $toggle = 'white';
- }
+ $toggle = ($toggle eq 0) ? 1 : 0 ;
}
$template->param(loop => \@loop);
}
$template->param(loop => \@loop);
@@
-167,6
+154,6
@@
if ($op eq 'add_form') {
nextpage => $offset+$pagesize);
}
}
nextpage => $offset+$pagesize);
}
}
-
+
output_html_with_http_headers $input, $cookie, $template->output;
output_html_with_http_headers $input, $cookie, $template->output;