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

Passing three tests. Empty query, single content value, multi-content values

Browse source
This commit is contained in:
David Sauve 2009-11-10 20:47:59 -05:00
parent 529edc24b4
commit 35f51e97bc
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/xapian_tests/tests/xapian_query.py
View file

@ -56,11 +56,11 @@ class XapianSearchQueryTestCase(TestCase):
self.sq.add_filter(SQ(content='hello'))
self.assertEqual(self.sq.build_query().get_description(), 'Xapian::Query(hello)')
# def test_build_query_multiple_words_and(self):
# self.sq.add_filter(SQ(content='hello'))
# self.sq.add_filter(SQ(content='world'))
# self.assertEqual(self.sq.build_query().get_description(), 'Xapian::Query((hello AND world))')
#
def test_build_query_multiple_words_and(self):
self.sq.add_filter(SQ(content='hello'))
self.sq.add_filter(SQ(content='world'))
self.assertEqual(self.sq.build_query().get_description(), 'Xapian::Query((hello AND world))')
# def test_build_query_multiple_words_not(self):
# self.sq.add_filter(~SQ(content='hello'))
# self.sq.add_filter(~SQ(content='world'))

6
xapian_backend.py
View file

@ -937,9 +937,13 @@ class SearchQuery(BaseSearchQuery):
if not self.query_filter:
query = xapian.Query('')
else:
query_list = []
for child in self.query_filter.children:
expression, value = child
query = xapian.Query(value)
query_list.append(value)
query = xapian.Query(xapian.Query.OP_AND, query_list)
return query