[Lxr-commits] CVS: lxr search,1.25,1.26

[Dave B. <bro...@us...>]

Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29489

Modified Files:
	search 
Log Message:
use same template variables between swish-e & glimpse;
use parenthesis to avoid the swish-e syntax problem instead of providing a tip;


Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- search	26 Jul 2004 20:47:43 -0000	1.25
+++ search	26 Jul 2004 20:53:17 -0000	1.26
@@ -150,7 +150,7 @@
 	unless (open(SWISH, "-|")) {
 		open(STDERR, ">&STDOUT");
 		exec($config->swishbin, "-f", $config->swishdir . "/" . $release . ".index",
-			"-w", "'" . $searchtext . "'");
+			"-w", "'(" . $searchtext . ")'");
 
 		print(STDERR "Couldn't exec " . $config->swishbin . ": $!\n");
 		kill(9, $$);
@@ -176,8 +176,6 @@
 		return @ret;
 	} else {
 		print("<b>Search failed</b><br>\n@result");
-		print "<br><i>Tip: you may need to quote words that end with *</i>"
-		  if join('', @result) =~ /Wildcard not allowed within a word/;
 		return;
 	}
 }
@@ -195,7 +193,6 @@
 			$ret .= expandtemplate(
 				$templ,
 				(
-					score   => sub { return '' },
 					text    => sub { return '' },
 					fileref => sub { fileref("$file", "find-file", "/$file") },
 				)
@@ -219,7 +216,7 @@
 			$ret .= expandtemplate(
 				$templ,
 				(
-					score   => sub { return $score },
+					text   => sub { return $score },
 					fileref => sub { fileref("$file", "find-file", "/$file") },
 				)
 			);