--- a/handlers.py	Wed Feb 11 02:21:43 2009 +0200
+++ b/handlers.py	Wed Feb 11 03:04:35 2009 +0200
@@ -9,7 +9,7 @@
 import urls, channels, helpers
 import preferences as prefs
 from preferences import preferences
-import config
+import config, log_search
 
 # load templates from here
 templates = template.TemplateLoader("templates",
@@ -19,11 +19,6 @@
     config          = config,
 )
 
-# our LogSearch thing
-# XXX: move elsewhere
-import log_search
-search_index = log_search.LogSearchIndex(config.LOG_CHANNELS, config.SEARCH_INDEX_PATH, 'r')
-
 def index (request) :
     """
         The topmost index page, display a list of available channels, perhaps some general stats
@@ -214,7 +209,7 @@
     if q :
         try :
             # do search
-            lines = search_index.search_simple(channel, q, count, skip)
+            lines = log_search.get_index().search_simple(channel, q, count, skip)
 
             # update max?
             if max and page > max :