--- trunk/WebPac.pm	2003/09/02 13:24:33	120
+++ trunk/WebPac.pm	2003/09/03 20:08:26	122
@@ -108,7 +108,7 @@
 					$s.= ($s) ? "and " : "";
 					$s.="not " if ($1 eq "-");
 					$s.="$2* ";
-				} elsif (m/(and|or|not)/i) {
+				} elsif (m/^\s*(and|or|not)\s*$/i) {
 					$s.="$_ ";
 				# don't add * to words with less than x chars
 				} elsif (length($_) <= $MIN_WILDCARD) {
@@ -162,6 +162,8 @@
 		$sw_q .= join("\" or swishdocpath=\"",@path_arr);
 		$sw_q .= "\")";
 		$tmpl->param('full',1);	# show full records
+	} else {
+		$tmpl->param('full',0);
 	}
 
 	my $hits = $sh->query($sw_q);
@@ -182,7 +184,7 @@
 			my @result;
 			for (my $i=0; $i<$rows; $i++) {
 				my $r = $swish_results[$offset+$i];
-				if ($r && $q->param('show_full')) {
+				if ($r && $tmpl->param('full')) {
 					push @result, $r;
 				} elsif ($r) {
 					# if not full output, skip html