[Lxr-commits] CVS: lxr search,1.48,1.49

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23005

Modified Files:
	search 
Log Message:
search: Issue a warning when free-text search disabled in lxr.conf

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- search	21 Nov 2012 13:30:16 -0000	1.48
+++ search	23 Jan 2013 16:29:05 -0000	1.49
@@ -593,7 +593,15 @@
 httpinit;
 makeheader('search');
 if ($files->isa("LXR::Files::Plain")) {
-	&search;
+	if	(	$config->{'glimpsebin'}
+			&& $config->{'glimpsebin'} =~ m!$(.*/)?true$!
+		||	$config->{'swishbin'}
+			&& $config->{'swishbin'} =~ m!$(.*/)?true$!
+		) {
+		print "<h2 class='error'>Free-text search disabled in configuration!</h2>\n";
+	} else {
+		&search;
+	}
 } else {
 	print "<h2 class='error'>Free-text search not available with VCSs!</h2>\n";
 }