Hopiu/xapian-haystack
1
0
Fork 0
mirror of https://github.com/Hopiu/xapian-haystack.git synced 2026-05-16 11:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More refactor work

Browse source
This commit is contained in:
David Sauve 2009-11-09 20:01:20 -05:00
parent 01ecd8ac17
commit 4242f77662
2 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,22 +49,22 @@ class XapianSearchQueryTestCase(TestCase):
settings.HAYSTACK_XAPIAN_PATH = self.old_xapian_path
super(XapianSearchQueryTestCase, self).tearDown()
def test_build_query_all(self):
self.assertEqual(self.sq.build_query().get_description(), 'Xapian::Query(<alldocuments>)')
# def test_build_query_all(self):
# self.assertEqual(self.sq.build_query().get_description(), 'Xapian::Query(<alldocuments>)')
def test_build_query_single_word(self):
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_not(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((NOT hello NOT 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'))
# self.assertEqual(self.sq.build_query().get_description(), 'Xapian::Query((NOT hello NOT world))')
# def test_build_query_multiple_words_or(self):
# self.sq.add_filter('content', 'hello', use_or=True)

48
xapian_backend.py
View file

@ -932,24 +932,42 @@ class SearchQuery(BaseSearchQuery):
"""
super(SearchQuery, self).__init__(backend=backend)
self.backend = backend or SearchBackend()
def as_xapian_query(self, parent, query_fragment_callback):
query_list = []
for child in parent.children:
if hasattr(child, 'as_query_string'):
query_list.append(self.as_xapian_query(child, query_fragment_callback))
else:
expression, value = child
field, filter_type = self.query_filter.split_expression(expression)
query_list.append(query_fragment_callback(field, filter_type, value))
return xapian.Query(xapian.Query.OP_AND, query_list)
def build_query(self):
if not self.query_filter.children:
return xapian.Query('')
else:
query_list = []
for child in self.query_filter.children:
if isinstance(child, self.query_filter.__class__):
pass
else:
expression, value = child
field, filter_type = self.query_filter.split_expression(expression)
query_list.append(xapian.Query(value))
return xapian.Query(xapian.Query.OP_AND, query_list)
query = self.as_xapian_query(self.query_filter, self.build_query_fragment)
def build_query_fragment(self, field, filter_type, value):
return xapian.Query(value)
#
# if not self.query_filter.children:
# return xapian.Query('')
# else:
# query_list = []
#
# for child in self.query_filter.children:
# if isinstance(child, self.query_filter.__class__):
# query_list.append(self.build_query(child))
# else:
# expression, value = child
# field, filter_type = self.query_filter.split_expression(expression)
# query_list.append(xapian.Query(value))
#
# return xapian.Query(xapian.Query.OP_AND, query_list)
# def build_query_fragment(self, field, filter_type, value):
# print 'field: ', field
# print 'filter_type: ', filter_type