Package: roundup
Version: 1.4.13-2
Forwarded: http://issues.roundup-tracker.org/issue2550647
User: o...@debian.org
Usertags: xapian1.2

I'm aiming to get Xapian 1.2 into the next Debian stable release, so I've 
been checking all the Debian packages which depend on Xapian.

Xapian 1.2.0 drops support for some deprecated features, and roundup
uses one: MSetItem's get_docid() method should now be a docid property.

I've attached a patch which corrects this use such that the code should work
both with Xapian 1.0.x and with 1.2.x, but it is untested as I don't actually
use roundup, so setting up a test is a bit tricky for me to do.

If you can talk me through what to do, I can try to check this.  Or if you want
to check with Xapian 1.2.x yourself, there are packages of xapian-core and
xapian-bindings in experimental (xapian-bindings only for x86-64 currently as
the experimental buildds don't take dependencies from experimental...)

I've filed a ticket upstream with a more substantial patch:

http://issues.roundup-tracker.org/issue2550647

That patch also fixes some non-critical issues, but for getting Xapian 1.2 into
Debian, we only *need* to fix the single use of a deprecated feature which has
been removed.

Cheers,
    Olly
--- python-django-djapian-2.3.1.orig/src/djapian/resultset.py
+++ python-django-djapian-2.3.1/src/djapian/resultset.py
@@ -174,15 +174,15 @@
         self._resultset_cache = []
 
         for match in self._mset:
-            doc = match.get_document()
+            doc = match.document
 
             model = doc.get_value(2)
             model = get_model(*model.split('.'))
             pk = model._meta.pk.to_python(doc.get_value(1))
 
-            percent = match.get_percent()
-            rank = match.get_rank()
-            weight = match.get_weight()
+            percent = match.percent
+            rank = match.rank
+            weight = match.weight
 
             tags = dict([(tag.prefix, tag.extract(doc))\
                                 for tag in self._indexer.tags])

Attachment: signature.asc
Description: Digital signature

Reply via email to