X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=WebPac.pm;h=4af84d866f66f6b6acfed2d41e7013c83ad246ff;hb=6a631ecdcd789163702283df7d9a58e6fd0a8869;hp=a08a711711ab837a6bbfd21a10bd51c6c898a5a0;hpb=99ba7de9b0b0145b69d7e94d5a0f9640e20f1c85;p=webpac

diff --git a/WebPac.pm b/WebPac.pm
index a08a711..4af84d8 100644
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -182,14 +182,17 @@ sub make_pager_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";
+			$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
@@ -224,6 +227,12 @@ sub show_results_list {
 
 	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
@@ -264,6 +273,8 @@ sub show_results_list {
 		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);
 		}
@@ -328,7 +339,7 @@ sub show_results_list {
 		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));
 
@@ -344,10 +355,13 @@ sub show_results_list {
 		$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);
@@ -373,7 +387,6 @@ sub show_results_list {
 	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;
@@ -467,7 +480,7 @@ sub show_index {
 		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);