changeset 5047:7a2151bf2797

improve xapian search warnings, fix pep8 issue
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 28 Aug 2009 13:37:03 +0200
parents a9e597a6e012
children 84478801c884
files MoinMoin/search/__init__.py MoinMoin/web/serving.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/__init__.py	Fri Aug 28 12:11:50 2009 +0200
+++ b/MoinMoin/search/__init__.py	Fri Aug 28 13:37:03 2009 +0200
@@ -48,9 +48,9 @@
             from MoinMoin.search.Xapian.search import XapianSearch, IndexDoesNotExistError
             searcher = XapianSearch(request, query, sort, mtime=mtime, historysearch=historysearch)
         except ImportError, error:
-            logging.warning("%s. Either disable Xapian completetly in your wikiconfig or upgrade your Xapian installation" % str(error))
+            logging.warning("%s. You should either set xapian_search = False in your wiki config or install/upgrade Xapian." % str(error))
         except IndexDoesNotExistError:
-            logging.warning("Xapian index does not exist. Please crate it. Slow moin search is used.")
+            logging.warning("Slow moin search is used because the Xapian index does not exist. You should create it using the moin index build command.")
 
     if searcher is None:
         searcher = MoinSearch(request, query, sort, mtime=mtime, historysearch=historysearch)
--- a/MoinMoin/web/serving.py	Fri Aug 28 12:11:50 2009 +0200
+++ b/MoinMoin/web/serving.py	Fri Aug 28 13:37:03 2009 +0200
@@ -151,7 +151,7 @@
 
     run_simple(hostname=hostname, port=port,
                application=application,
-               threaded=threaded, 
+               threaded=threaded,
                use_debugger=(debug == 'web'),
                passthrough_errors=(debug == 'external'),
                request_handler=RequestHandler,