full-text search wasn't coping with multiple multilinks to the same class

Author: Richard Jones

CHANGES.txt

@@ -4,6 +4,7 @@ are given with the most recent entry first.
 2006-??-?? 1.3.1
 Fixed:
 - setup.py had broken reference to roundup.cgi (sf bug 1593573)
+- full-text search wasn't coping with multiple multilinks to the same class
 
 
 2006-09-11 1.3.0

roundup/backends/indexer_common.py

@@ -1,4 +1,4 @@
-#$Id: indexer_common.py,v 1.7 2006-10-04 01:12:00 richard Exp $
+#$Id: indexer_common.py,v 1.8 2006-11-11 03:01:54 richard Exp $
 import re, sets
 
 from roundup import hyperdb
@@ -41,14 +41,16 @@ def search(self, search_terms, klass, ignore={}):
         designator_propname = {}
         for nm, propclass in klass.getprops().items():
             if _isLink(propclass):
-                designator_propname[propclass.classname] = nm
+                designator_propname.setdefault(propclass.classname,
+                    []).append(nm)
 
         # build a dictionary of nodes and their associated messages
         # and files
         nodeids = {}      # this is the answer
         propspec = {}     # used to do the klass.find
-        for propname in designator_propname.values():
-            propspec[propname] = {}   # used as a set (value doesn't matter)
+        for l in designator_propname.values():
+            for propname in l:
+                propspec[propname] = {}  # used as a set (value doesn't matter)
 
         # don't unpack hits entries as sqlite3's Row can't be unpacked :(
         for entry in hits:
@@ -70,14 +72,14 @@ def search(self, search_terms, klass, ignore={}):
                 continue
 
             # it's a linked class - set up to do the klass.find
-            linkprop = designator_propname[classname]   # eg, msg -> messages
-            propspec[linkprop][nodeid] = 1
+            for linkprop in designator_propname[classname]:
+                propspec[linkprop][nodeid] = 1
 
         # retain only the meaningful entries
         for propname, idset in propspec.items():
             if not idset:
                 del propspec[propname]
-        
+
         # klass.find tells me the klass nodeids the linked nodes relate to
         for resid in klass.find(**propspec):
             resid = str(resid)

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.80 2006-11-09 05:44:51 richard Exp $
+# $Id: db_test_base.py,v 1.81 2006-11-11 03:01:54 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -78,7 +78,7 @@ def setupSchema(db, create, module):
     issue = module.IssueClass(db, "issue", title=String(indexme="yes"),
         status=Link("status"), nosy=Multilink("user"), deadline=Date(),
         foo=Interval(), files=Multilink("file"), assignedto=Link('user'),
-        priority=Link('priority'))
+        priority=Link('priority'), spam=Multilink('msg'))
     stuff = module.Class(db, "stuff", stuff=String())
     session = module.Class(db, 'session', title=String())
     msg = module.FileClass(db, "msg", date=Date(),
@@ -772,6 +772,20 @@ def testIndexerSearching(self):
         # unindexed stopword
         self.assertEquals(self.db.indexer.search(['the'], self.db.issue), {})
 
+    def testIndexerSearchMulti(self):
+        m1 = self.db.msg.create(content="one two")
+        m2 = self.db.msg.create(content="two three")
+        i1 = self.db.issue.create(messages=[m1])
+        i2 = self.db.issue.create(spam=[m2])
+        self.db.commit()
+        self.assertEquals(self.db.indexer.search([], self.db.issue), {})
+        self.assertEquals(self.db.indexer.search(['one'], self.db.issue),
+            {i1: {'messages': [m1]}})
+        self.assertEquals(self.db.indexer.search(['two'], self.db.issue),
+            {i1: {'messages': [m1]}, i2: {'spam': [m2]}})
+        self.assertEquals(self.db.indexer.search(['three'], self.db.issue),
+            {i2: {'spam': [m2]}})
+
     def testReindexingChange(self):
         search = self.db.indexer.search
         issue = self.db.issue
@@ -1542,7 +1556,7 @@ def testAddProperty(self):
         keys.sort()
         self.assertEqual(keys, ['activity', 'actor', 'assignedto', 'creation',
             'creator', 'deadline', 'files', 'fixer', 'foo', 'id', 'messages',
-            'nosy', 'priority', 'status', 'superseder', 'title'])
+            'nosy', 'priority', 'spam', 'status', 'superseder', 'title'])
         self.assertEqual(self.db.issue.get('1', "fixer"), None)
 
     def testRemoveProperty(self):
@@ -1556,7 +1570,7 @@ def testRemoveProperty(self):
         keys.sort()
         self.assertEqual(keys, ['activity', 'actor', 'assignedto', 'creation',
             'creator', 'deadline', 'files', 'foo', 'id', 'messages',
-            'nosy', 'priority', 'status', 'superseder'])
+            'nosy', 'priority', 'spam', 'status', 'superseder'])
         self.assertEqual(self.db.issue.list(), ['1'])
 
     def testAddRemoveProperty(self):
@@ -1571,7 +1585,7 @@ def testAddRemoveProperty(self):
         keys.sort()
         self.assertEqual(keys, ['activity', 'actor', 'assignedto', 'creation',
             'creator', 'deadline', 'files', 'fixer', 'foo', 'id', 'messages',
-            'nosy', 'priority', 'status', 'superseder'])
+            'nosy', 'priority', 'spam', 'status', 'superseder'])
         self.assertEqual(self.db.issue.list(), ['1'])
 
 class ROTest(MyTestCase):