changeset 3104:ce6f12d51736

fix: only switch off xapian search if we didn't use it because of missing index (ported from 1.6)
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sat, 23 Feb 2008 20:08:32 +0100
parents 4ede355c6089
children af3dd2bc85cc
files MoinMoin/search/builtin.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/builtin.py	Sat Feb 23 19:43:26 2008 +0100
+++ b/MoinMoin/search/builtin.py	Sat Feb 23 20:08:32 2008 +0100
@@ -555,8 +555,10 @@
                         clock.stop('_xapianProcess')
             finally:
                 clock.stop('_xapianSearch')
-        else:
-            # we didn't use xapian in this request
+        elif not index:
+            # we didn't use xapian in this request because we have no index,
+            # so we can just disable it until admin builds an index and
+            # restarts moin processes
             self.request.cfg.xapian_search = 0
 
         # some postprocessing by _moinSearch is required