changeset 5078:37a4d53c56d1

SystemInfo: fix xapian index infos
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 01 Sep 2009 23:06:28 +0200
parents 1a6bf72f4587
children 32ad275278d0
files MoinMoin/macro/SystemInfo.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/SystemInfo.py	Tue Sep 01 21:41:55 2009 +0200
+++ b/MoinMoin/macro/SystemInfo.py	Tue Sep 01 23:06:28 2009 +0200
@@ -127,7 +127,7 @@
         row(_('Local extension parsers'),
             ', '.join(wikiutil.wikiPlugins('parser', self.macro.cfg)) or nonestr)
 
-        from MoinMoin.search import XapianSearch
+        from MoinMoin.search.Xapian.indexing import XapianIndex
         xapState = (_('Disabled'), _('Enabled'))
         idxState = (_('index available'), _('index unavailable'))
 
@@ -142,9 +142,9 @@
         xapRow += ', %s' % xapVersion
 
         if xapian and xapian_enabled:
-            idx = XapianSearch._xapianIndex(request)
-            available = idx and idxState[0] or idxState[1]
-            mtime = _('last modified: %s') % (idx and
+            idx = XapianIndex(request)
+            available = idx.exists() and idxState[0] or idxState[1]
+            mtime = _('last modified: %s') % (idx.exists() and
                 request.user.getFormattedDateTime(idx.mtime()) or _('N/A'))
             xapRow += ', %s, %s' % (available, mtime)