Hopiu/xapian-haystack
1
0
Fork 0
mirror of https://github.com/Hopiu/xapian-haystack.git synced 2026-04-24 00:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated search to accept a set for instead of a list

Browse source
This commit is contained in:
David Sauve 2009-11-26 16:18:07 -05:00
parent 1c198ba914
commit 482e432578
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/xapian_tests/tests/xapian_backend.py
View file

@ -189,7 +189,7 @@ class XapianSearchBackendTestCase(TestCase):
self.assertEqual([result.pk for result in self.sb.search('value:10')['results']], [2])
self.assertEqual([result.pk for result in self.sb.search('flag:false')['results']], [2])
self.assertEqual([result.pk for result in self.sb.search('popularity:35.5')['results']], [2])
# NOT operator
self.assertEqual([result.pk for result in self.sb.search('NOT name:david1')['results']], [2, 3])
self.assertEqual([result.pk for result in self.sb.search('NOT name:david1 AND index')['results']], [2, 3])
@ -263,8 +263,8 @@ class XapianSearchBackendTestCase(TestCase):
self.sb.update(self.msi, self.sample_objs)
self.assertEqual(len(self.xapian_search('')), 3)
self.assertEqual(self.sb.search('', narrow_queries=['name:david1']), {'hits': 0, 'results': []})
results = self.sb.search('index', narrow_queries=['name:david1'])
self.assertEqual(self.sb.search('', narrow_queries=set(['name:david1'])), {'hits': 0, 'results': []})
results = self.sb.search('index', narrow_queries=set(['name:david1']))
self.assertEqual(results['hits'], 1)
def test_highlight(self):

4
xapian_backend.py
View file

@ -330,12 +330,12 @@ class SearchBackend(BaseSearchBackend):
if limit_to_registered_models:
if narrow_queries is None:
narrow_queries = []
narrow_queries = set()
registered_models = self.build_registered_models_list()
if len(registered_models) > 0:
narrow_queries.append(
narrow_queries.add(
' '.join(['django_ct:%s' % model for model in registered_models])
)