--- trunk/WebPac.pm	2005/02/15 21:48:16	659
+++ trunk/WebPac.pm	2005/02/16 00:26:37	670
@@ -328,7 +328,7 @@
 		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 +344,13 @@
 		$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 +376,6 @@
 	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 +469,7 @@
 		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);