[Lxr-commits] CVS: lxr search,1.27,1.28

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

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

Modified Files:
	search 
Log Message:
handle errors a bit better; also, rearrange piping in swishsearch for iPlanet

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- search	2 Sep 2004 15:26:42 -0000	1.27
+++ search	18 Oct 2004 20:22:57 -0000	1.28
@@ -146,25 +146,23 @@
 		  "<p align='center'><i>Version '$release' has not been indexed and is unavailable for searching.</i></p>";
 		return;
 	}
-
 	$ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
 	unless (open(SWISH, "-|")) {
-		open(STDERR, ">&STDOUT");
 		exec($config->swishbin, "-f", $config->swishdir . "/" . $release . ".index",
 			"-w", "'(" . $searchtext . ")'");
-
+		open(STDERR, ">&STDOUT");
 		print(STDERR "Couldn't exec " . $config->swishbin . ": $!\n");
 		kill(9, $$);
 	}
 
 	my @result = grep { not /^[\#\.]/ } <SWISH>;
 	close(SWISH);
-	my $retval = $? >> 8;
-
+	my $retval = $?;
 	my @ret;
 	if ($retval == 0) {
 		my $numlines = 0;
 		foreach my $hit (@result) {
+			print $hit, "<br>\n" if $hit =~ $hit =~ /No such file or directory/;	# feeble attempt to print possible errors (e.g. incomplete LD_LIBRARY_PATH causes linking errors)
 			next if $hit =~ /^err:/;    # skip; only 'no results' errors happen with return value 0
 
 			my ($score, $file) = $hit =~ /^(\d+) \/(.+) "(.+)" \d+/;
@@ -176,7 +174,7 @@
 		}
 		return @ret;
 	} else {
-		print("<b>Search failed</b><br>\n@result");
+		print("<b><font color='red'>Search failed: internal error</font></b><br>\n@result");
 		return;
 	}
 }
@@ -310,9 +308,7 @@
 		)
 	);
 }
-
 httpinit;
-
 &makeheader('search');
 &search;
 &makefooter('search');