changeset 2214:57c403f5f075

xapian: fixed building index for 1.0
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sat, 26 May 2007 15:48:09 +0200
parents fae771ce78ce
children c00b5f8d211f
files MoinMoin/support/xapwrap/index.py MoinMoin/wikiutil.py
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/support/xapwrap/index.py	Thu Jun 21 09:14:31 2007 +0200
+++ b/MoinMoin/support/xapwrap/index.py	Sat May 26 15:48:09 2007 +0200
@@ -308,7 +308,7 @@
                     db.add_database(xapian.Database(path))
                 return klass(db)
             else:
-                return klass(xapian.open(*args, **kwargs))
+                return klass(xapian.WriteableDatabase(*args, **kwargs))
         except (IOError, RuntimeError, ValueError), e:
             errorMsg = e.args[0]
             for subString, exceptionClass in klass.exceptionStrMap.iteritems():
--- a/MoinMoin/wikiutil.py	Thu Jun 21 09:14:31 2007 +0200
+++ b/MoinMoin/wikiutil.py	Sat May 26 15:48:09 2007 +0200
@@ -1537,7 +1537,8 @@
     @return: formatted link tag
     """
     if formatter is None:
-        formatter = request.html_formatter
+        from MoinMoin.formatter.text_html import Formatter
+        formatter = Formatter(request)
     if 'css_class' in kw:
         css_class = kw['css_class']
         del kw['css_class'] # one time is enough