[Lxr-commits] CVS: lxr/templates lxr.conf,1.7,1.8

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/templates
In directory usw-pr-cvs1:/tmp/cvs-serv30089/templates

Modified Files:
	lxr.conf 
Log Message:
Add ability to use swish-e as a free-text search engine, rather than Glimpse.
Swish-e is fully free software, unlike Glimpse.

Patch from Arne.


Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lxr.conf	2002/01/23 14:59:21	1.7
+++ lxr.conf	2002/01/23 15:52:51	1.8
@@ -5,9 +5,22 @@
  {
   # Global configuration
 
-  'glimpsebin'	=> '/info/lxr/bin/glimpse',   # Path to glimpse executable
-  'ectagsbin'	=> '/usr/bin/ctags',          # Path to Exuberant Ctags executable
-  'tmpdir'		=> '/tmp',                    # Place where lxr can write temporary files
+  # Path to glimpse executable.
+  # Define this OR the swish-e variables depending which search engine you want to use.
+  'glimpsebin'	=> '/info/lxr/bin/glimpse',
+
+  # Location of SWISH-E indexer binary
+  'swishindex' => '/usr/local/bin/swish-e',
+
+  # Location of SWISH-E search binary
+  'swishsearch' => '/usr/local/bin/swish-e',
+
+  # Path to Exuberant Ctags executable
+  'ectagsbin'	=> '/usr/bin/ctags',
+
+  # Place where lxr can write temporary files
+  'tmpdir'		=> '/tmp',
+
   # Location of the Generic.pm config file
   'genericconf' => '/path/to/lib/LXR/Lang/generic.conf'
 
@@ -78,6 +91,24 @@
 
   # The name to display for this source tree
   'sourcerootname'	=> 'Example',
+
+
+  # The DBI identifier for the database to use
+  # For mysql, the format is dbi:mysql:dbname=<name>
+  # for Postgres, it is dbi:Pg:dbname=<name>
+  'dbname'		=> 'dbi:mysql:dbname=lxr',
+
+  # If you need to specify the username or password for the database connection,
+  # uncomment the following two lines
+  #  'dbpass'		=> 'foo',
+  #  'dbuser'		=> 'lxr',
+
+  # For using glimpse, the directory to store the .glimpse files in is required
+  'dbdir' => '/path/to/glimpse/databases',
+
+  # Location of swish-e index database files if using swish-e
+  'swishdir' => '/a/directory/here/',
+
   
   # where to look for include files inside the sourcetree.  This is used to hyperlink
   # to included files.
@@ -158,16 +189,5 @@
 					 'python' => 'Python',
 					},
   
-  # The DBI identifier for the database to use
-  # For mysql, the format is dbi:mysql:dbname=<name>
-  # for Postgres, it is dbi:Pg:dbname=<name>
-  'dbname'		=> 'dbi:mysql:dbname=lxr',
-
-  # If you need to specify the username or password for the database connection,
-  # uncomment the following two lines
-  #  'dbpass'		=> 'foo',
-  #  'dbuser'		=> 'lxr',
 
-  # For using glimpse, the directory to store the .glimpse files in is required
-  'dbdir' => '/path/to/glimpse/databases',
 })