--- trunk/WebPac.pm	2003/02/23 15:47:40	35
+++ trunk/WebPac.pm	2003/03/23 01:17:49	47
@@ -67,6 +67,9 @@
 
 	my @s_arr;	# all queries are located here
 
+	my @path_arr = $q->param('path');
+	my $full = $q->param('full');
+
 	for(my $i = 1; $i <=10; $i++) {
 
 		return show_index($self, $i) if ($q->param("f".$i."_index"));
@@ -109,23 +112,30 @@
 			push @swish_results, {
 				nr => ($#swish_results + 2),
 				path => $hit->swishdocpath,
-#				headline => $from_utf8->convert($hit->headline),
-#				html => back2html($from_utf8->convert($hit->html)),
-				headline => $hit->headline,
-				html => back2html($hit->html),
+				headline => $from_utf8->convert($hit->headline),
+				html => back2html($from_utf8->convert($hit->html)),
 				rank => $hit->swishrank };
 
 		},
 		#startnum => 0,
-		maxhits => $MAX_HITS,
+		maxhits => $MAX_HITS
 	);
 
 	die $SWISH::errstr unless $sh;
 
-	my $hits = $sh->query(join(" and ",@s_arr)) || 0;	# FIX: and/or
+	# construct swish query
+	my $sw_q = join(" and ",@s_arr);
+	if (@path_arr) {
+		$sw_q .= "and (swishdocpath=\"";
+		$sw_q .= join("\" or swishdocpath=\"",@path_arr);
+		$sw_q .= "\")";
+		$tmpl->param('full',1);	# show full records
+	}
+
+	my $hits = $sh->query($sw_q);
 
 	$tmpl->param('hits',$hits);
-	$tmpl->param('search',join(" and ",@s_arr));
+	$tmpl->param('search',$sw_q);
 
 	# create a Pager object
 	my $pager = HTML::Pager->new(