projects
/
webpac
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugfix: re-enable HTML::FillInForm to create persistent search using
[webpac]
/
WebPac.pm
diff --git
a/WebPac.pm
b/WebPac.pm
index
6a1c7ef
..
6d31110
100644
(file)
--- a/
WebPac.pm
+++ b/
WebPac.pm
@@
-182,14
+182,17
@@
sub make_pager_vars {
my $tmpl = shift @_;
my @persist_vars = @_;
my $hidden_vars = '';
my $tmpl = shift @_;
my @persist_vars = @_;
my $hidden_vars = '';
+ my $hidden_search = '';
foreach my $v (@persist_vars) {
foreach my $val ($q->param($v)) {
next if (! $val || $val eq '');
$hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
foreach my $v (@persist_vars) {
foreach my $val ($q->param($v)) {
next if (! $val || $val eq '');
$hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
+ $hidden_search .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n" if ($v ne "rm");
}
}
$tmpl->param('PAGER_HIDDEN', $hidden_vars);
}
}
$tmpl->param('PAGER_HIDDEN', $hidden_vars);
+ $tmpl->param('SEARCH_HIDDEN', $hidden_search);
$tmpl->param('PAGER_JAVASCRIPT', qq#
<SCRIPT LANGUAGE="Javascript">
<!-- Begin
$tmpl->param('PAGER_JAVASCRIPT', qq#
<SCRIPT LANGUAGE="Javascript">
<!-- Begin
@@
-328,7
+331,7
@@
sub show_results_list {
push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";
}
push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";
}
- my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1);
+ my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1
, die_on_bad_params => 0
);
$tmpl->param('url_params',"?".join("&",@url_params));
$tmpl->param('url_params',"?".join("&",@url_params));
@@
-345,6
+348,13
@@
sub show_results_list {
push @persist_vars, "sort";
}
push @persist_vars, "sort";
}
+ my $sortby = $q->param("sortby");
+ if ($sortby) {
+ $sort = $sortby;
+ push @persist_vars, "sortby";
+ }
+ $tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
+
# construct swish query
my $sw_q = join(" and ",@s_arr);
if (@path_arr && $q->param('show_full')) {
# construct swish query
my $sw_q = join(" and ",@s_arr);
if (@path_arr && $q->param('show_full')) {
@@
-359,9
+369,11
@@
sub show_results_list {
$tmpl->param('full',0);
}
$tmpl->param('full',0);
}
+ my $swish_msg = ' ';
+
# create new swish instance
my $swish = SWISH::API->new($INDEX);
# create new swish instance
my $swish = SWISH::API->new($INDEX);
-
die $swish->ErrorString.":
".$swish->LastErrorMsg if $swish->Error;
+
$swish_msg .= $swish->ErrorString."
".$swish->LastErrorMsg if $swish->Error;
# execute query and get number of results from SWISH-E
my $search = $swish->New_Search_Object;
# execute query and get number of results from SWISH-E
my $search = $swish->New_Search_Object;
@@
-369,12
+381,14
@@
sub show_results_list {
$search->SetSort($sort);
my $results = $search->Execute($sw_q);
$search->SetSort($sort);
my $results = $search->Execute($sw_q);
-
die $swish->ErrorString.":
".$swish->LastErrorMsg if $swish->Error;
+
$swish_msg .= $swish->ErrorString."
".$swish->LastErrorMsg if $swish->Error;
my $hits = $results->Hits;
$tmpl->param('hits',$hits);
my $hits = $results->Hits;
$tmpl->param('hits',$hits);
- $tmpl->param('search',$sw_q);
+ my $search_msg = $sw_q;
+ $search_msg .= '<em>'.$swish_msg.'</em>' if ($swish_msg);
+ $tmpl->param('search', $search_msg);
$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
@@
-458,7
+472,7
@@
sub show_index {
return $html;
}
return $html;
}
- my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1);
+ my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1
, die_on_bad_params => 0
);
$tmpl->param('field',$field);
$tmpl->param('limit',$limit);
$tmpl->param('total',$total);
$tmpl->param('field',$field);
$tmpl->param('limit',$limit);
$tmpl->param('total',$total);