Index: roundup/backends/indexer_xapian.py =================================================================== --- roundup/backends/indexer_xapian.py (revision 4483) +++ roundup/backends/indexer_xapian.py (working copy) @@ -24,7 +24,6 @@ '''Save the changes to the index.''' if not self.transaction_active: return - # XXX: Xapian databases don't actually implement transactions yet database = self._get_database() database.commit_transaction() self.transaction_active = False @@ -36,7 +35,6 @@ def rollback(self): if not self.transaction_active: return - # XXX: Xapian databases don't actually implement transactions yet database = self._get_database() database.cancel_transaction() self.transaction_active = False @@ -59,7 +57,9 @@ # open the database and start a transaction if needed database = self._get_database() - # XXX: Xapian databases don't actually implement transactions yet + + # XXX: Xapian now supports transactions, but the testsuite doesn't + # expect to have to call save_index(). #if not self.transaction_active: #database.begin_transaction() #self.transaction_active = True @@ -77,9 +77,8 @@ query = xapian.Query(xapian.Query.OP_AND, [identifier]) enquire.set_query(query) matches = enquire.get_mset(0, 10) - if matches.size(): # would it killya to implement __len__()?? - b = matches.begin() - docid = b.get_docid() + if len(matches): + docid = matches[0].docid else: docid = None Index: doc/installation.txt =================================================================== --- doc/installation.txt (revision 4483) +++ doc/installation.txt (working copy) @@ -69,9 +69,7 @@ installed and used. You will need to run the "roundup-admin reindex" command if the tracker has existing data. - Roundup requires Xapian *newer* than 0.9.2 - it may be necessary for - you to install a snapshot. Snapshot "0.9.2_svn6532" has been tried - successfully. + Roundup requires Xapian 1.0.0 or newer. pyopenssl If pyopenssl_ is installed the roundup-server can be configured @@ -85,7 +83,7 @@ configured, you can require email to be cryptographically signed before roundup will allow it to make modifications to issues. -.. _Xapian: http://www.xapian.org/ +.. _Xapian: http://xapian.org/ .. _pytz: http://www.python.org/pypi/pytz .. _Olson tz database: http://www.twinsun.com/tz/tz-link.htm .. _pyopenssl: http://pyopenssl.sourceforge.net