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

More refactor to keep things DRY

Browse source
This commit is contained in:
David Sauve 2009-11-30 16:49:47 -05:00
parent bbb38e3ef6
commit f027e26644
1 changed files with 46 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
xapian_backend.py
View file

@ -937,64 +937,10 @@ class SearchQuery(BaseSearchQuery):
value = _marshal_value(value)
if field == 'content':
if ' ' in value:
if is_not:
query_list.append(
xapian.Query(
xapian.Query.OP_AND_NOT,
xapian.Query(''),
xapian.Query
(xapian.Query.OP_PHRASE, value.split()
)
)
)
else:
query_list.append(
xapian.Query(xapian.Query.OP_PHRASE, value.split())
)
else:
if is_not:
query_list.append(
xapian.Query(xapian.Query.OP_AND_NOT, '', value)
)
else:
query_list.append(xapian.Query(value))
query_list.append(self._content_field(value, is_not))
else:
if filter_type == 'exact':
if ' ' in value:
phrase_query = xapian.Query(
xapian.Query.OP_PHRASE, [
'%s%s%s' % (
DOCUMENT_CUSTOM_TERM_PREFIX,
field.upper(), _marshal_value(term)
) for term in value.split()
]
)
if is_not:
query_list.append(
xapian.Query(
xapian.Query.OP_AND_NOT,
xapian.Query(''),
phrase_query
)
)
else:
query_list.append(phrase_query)
else:
term = '%s%s%s' % (
DOCUMENT_CUSTOM_TERM_PREFIX,
field.upper(), value
)
if is_not:
query_list.append(
xapian.Query(
xapian.Query.OP_AND_NOT, '', term
)
)
else:
query_list.append(xapian.Query(term))
query_list.append(self._filter_exact(value, field, is_not))
elif filter_type == 'gt':
pass
elif filter_type == 'gte':
@ -1026,6 +972,50 @@ class SearchQuery(BaseSearchQuery):
else:
return xapian.Query(xapian.Query.OP_AND, query_list)
def _content_field(self, value, is_not):
if ' ' in value:
if is_not:
return xapian.Query(
xapian.Query.OP_AND_NOT,
xapian.Query(''),
xapian.Query
(xapian.Query.OP_PHRASE, value.split()
)
)
else:
return xapian.Query(xapian.Query.OP_PHRASE, value.split())
else:
if is_not:
return xapian.Query(xapian.Query.OP_AND_NOT, '', value)
else:
return xapian.Query(value)
def _filter_exact(self, value, field, is_not):
if ' ' in value:
phrase_query = xapian.Query(
xapian.Query.OP_PHRASE, [
'%s%s%s' % (
DOCUMENT_CUSTOM_TERM_PREFIX, field.upper(), _marshal_value(term)
) for term in value.split()
]
)
if is_not:
return xapian.Query(
xapian.Query.OP_AND_NOT, xapian.Query(''), phrase_query
)
else:
return phrase_query
else:
term = '%s%s%s' % (
DOCUMENT_CUSTOM_TERM_PREFIX, field.upper(), value
)
if is_not:
return xapian.Query(xapian.Query.OP_AND_NOT, '', term)
else:
return xapian.Query(term)
def _marshal_value(value):
"""