changeset 859:c76dd5d97e0e

small fixes and cleanups
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Mon, 19 Jun 2006 11:58:46 +0200
parents db0e4edcb6ac
children bf18e19e618d
files MoinMoin/multiconfig.py docs/CHANGES.fpletz
diffstat 2 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/multiconfig.py	Mon Jun 19 11:37:09 2006 +0200
+++ b/MoinMoin/multiconfig.py	Mon Jun 19 11:58:46 2006 +0200
@@ -276,6 +276,7 @@
                                     # instead of just IPs
 
     xapian_search = False # disabled until xapian is finished
+    xapian_index_dir = None
 
     mail_login = None # or "user pwd" if you need to use SMTP AUTH
     mail_sendmail = None # "/usr/sbin/sendmail -t -i" to not use SMTP, but sendmail
@@ -482,11 +483,6 @@
             if not getattr(self, name, None):
                 setattr(self, name, os.path.join(data_dir, dirname))
 
-        # common xapian index directory
-        if getattr(self, 'xapian_search', False):
-            name = 'xapian_index_dir'
-            setattr(self, name, getattr(self, name, None))
-            
         # Try to decode certain names which allow unicode
         self._decode()
 
--- a/docs/CHANGES.fpletz	Mon Jun 19 11:37:09 2006 +0200
+++ b/docs/CHANGES.fpletz	Mon Jun 19 11:58:46 2006 +0200
@@ -10,14 +10,15 @@
     * Mockup the new search UI
     * Write/update documentation for all the new search stuff
     * Indexing and searching of categories (new term prefix)
+    * MoinMoin.Xapian.use_stemming -> request.cfg.xapian_use_stemming
 
   New Features:
     * Faster search thanks to Xapian
     * Searching for languages with new prefix lang/language, i.e. lang:de
       Note: Only available when Xapian is activated
     * New config options:
-        xapian_search        (bool)     enables xapian-powered search
-        xapian_index_dir     (string)   directory for xapian indices 
+        xapian_search        0      enables xapian-powered search
+        xapian_index_dir     None   directory for xapian indices
   
   Bugfixes (only stuff that is buggy in moin/1.6 main branch):
     * ...
@@ -75,7 +76,7 @@
                 ...
 
         Possible extension: Xapian can handle multiple databases, maybe
-        allow searching across defined wikis on a wikifarm?
+        allow searching across defined wikis on a wikifarm
     * All stemming/matching issues resolved (hopefully)
     * Works now without xapian installed (enhance error reporting)