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";
+ $hidden_search .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n" if ($v ne "rm");
}
}
$tmpl->param('PAGER_HIDDEN', $hidden_vars);
+ $tmpl->param('SEARCH_HIDDEN', $hidden_search);
$tmpl->param('PAGER_JAVASCRIPT', qq#
<SCRIPT LANGUAGE="Javascript">
<!-- Begin
my $q = $self->query();
+ # submit was reset?
+ if ($q->param('reset')) {
+ $q->delete_all;
+ return $self->show_search_form();
+ }
+
# load template for this page
my @s_arr; # all queries are located here
push @url_params_persist,"f$i=".$q->url_param("f$i") if ($persist);
foreach my $v ($q->url_param("v$i")) {
+ # escape quotes so that phrase search work
+ $v =~ s/"/%22/g;
push @url_params,"v$i=$v";
push @url_params_persist,"v$i=$v" if ($persist);
}
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));
$sort = 'headline';
push @persist_vars, "sort";
}
- if ($q->param("sortby")) {
- $sort = $q->param("sortby");
- 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);
my $search = $swish->New_Search_Object;
$search->SetSort($sort);
-print "sort: $sort\n";
my $results = $search->Execute($sw_q);
$swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
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);