[Lxr-commits] CVS: lxr INSTALL,1.15,1.16 find,1.21,1.22 genxref,1.34,1.35 search,1.22,1.23

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

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

Modified Files:
	INSTALL find genxref search 
Log Message:
consolidate swishindex & swishsearch variables into swishbin

Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- INSTALL	19 Jul 2004 18:16:35 -0000	1.15
+++ INSTALL	19 Jul 2004 20:03:31 -0000	1.16
@@ -86,8 +86,7 @@
  
 If you have swish-e installed, you should set
 
- 'swishindex' => '/path/to/your/swishe-e/executable'
- 'swishsearch' => '/path/to/your/swishe-e/executable'
+ 'swishbin' => '/path/to/your/swishe-e/executable'
 
 Comment out the variables for the indexer you are not using.
 Set 'htmlsearch' to either 'html-search-swish.html' or
@@ -193,7 +192,7 @@
 
 Alias /lxr /usr/local/lxr
 <Directory /usr/local/lxr>
-   AllowOverride All		
+   AllowOverride All
 </Directory>
 
 The distribution contains a .htaccess file set up to ensure that lxr

Index: find
===================================================================
RCS file: /cvsroot/lxr/lxr/find,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- find	19 Jul 2004 19:50:20 -0000	1.21
+++ find	19 Jul 2004 20:03:31 -0000	1.22
@@ -112,7 +112,7 @@
 	my $casesensitive = $HTTP->{'param'}->{'casesensitive'};
 
 	my $FILELISTING;
-	if ( $config->swishdir and $config->swishindex ) {
+	if ( $config->swishdir and $config->swishbin ) {
 		unless ( $FILELISTING = new IO::File( $config->swishdir . "/$release.filenames" ) ) {
 			&warning(
 "Version '$release' has not been indexed and is unavailable for searching<br>Could not open "

Index: genxref
===================================================================
RCS file: /cvsroot/lxr/lxr/genxref,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- genxref	19 Jul 2004 19:50:20 -0000	1.34
+++ genxref	19 Jul 2004 20:03:31 -0000	1.35
@@ -177,7 +177,7 @@
 		system("chmod 644 $string");
 	}
 
-	if ( $config->swishdir and $config->swishindex ) {
+	if ( $config->swishdir and $config->swishbin ) {
 		my $swish = new IO::Handle;
 		die $config->swishdir . " does not exist" unless -d $config->swishdir;
 		my $filelist = new IO::File $config->swishdir . "/$release.filenames", "w"
@@ -187,12 +187,12 @@
 
 		open( $swish,
 			    "| "
-			  . $config->swishindex
+			  . $config->swishbin
 			  . " -S prog -i stdin -v 1 -c swish-e.conf -f "
 			  . $config->swishdir . "/"
 			  . $release
 			  . ".index" )
-		  or die "Couldn't exec " . $config->swishindex . ": $!\n";
+		  or die "Couldn't exec " . $config->swishbin . ": $!\n";
 
 		feedswish( "/", $release, $swish, $filelist );
 

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- search	19 Jul 2004 19:50:20 -0000	1.22
+++ search	19 Jul 2004 20:03:31 -0000	1.23
@@ -125,10 +125,10 @@
 	$ENV{'PATH'} = '/bin:/usr/local/bin:/usr/bin:/usr/sbin';
 	unless ( open( SWISH, "-|" ) ) {
 		open( STDERR, ">&STDOUT" );
-		exec( $config->swishsearch, "-f", $config->swishdir . "/" . $release . ".index",
+		exec( $config->swishbin, "-f", $config->swishdir . "/" . $release . ".index",
 			"-m", $maxhits, "-w", "'" . $searchtext . "'" );
 
-		print( STDERR "Couldn't exec " . $config->swishsearch . ": $!\n" );
+		print( STDERR "Couldn't exec " . $config->swishbin . ": $!\n" );
 		kill( 9, $$ );
 	}
 
@@ -210,7 +210,7 @@
 	if ( $searchtext ne "" ) {
 		if ( $config->glimpsebin ) {
 			@results = glimpsesearch($searchtext);
-		} elsif ( $config->swishsearch and $config->swishdir ) {
+		} elsif ( $config->swishbin and $config->swishdir ) {
 			@results = swishsearch($searchtext);
 		} else {
 			warning("No freetext search engine configured.");