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

Changed backend column method to a property.

Browse source
This commit is contained in:
Jorge C. Leitão 2014-05-18 16:36:53 +02:00
parent 8c14898088
commit 552786b6ec
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xapian_backend.py
View file

@ -200,12 +200,13 @@ class XapianSearchBackend(BaseSearchBackend):
self._update_cache()
return self._content_field_name
def column(self, field_name):
@property
def column(self):
"""
Returns the column in the database of a given field name.
"""
self._update_cache()
return self._columns[field_name]
return self._columns
def update(self, index, iterable):
"""
@ -384,7 +385,7 @@ class XapianSearchBackend(BaseSearchBackend):
if field_names:
for field_name in field_names:
try:
self.column(field_name)
self.column[field_name]
except KeyError:
raise InvalidIndexError('Trying to use non indexed field "%s"' % field_name)
@ -474,7 +475,7 @@ class XapianSearchBackend(BaseSearchBackend):
sort_field = sort_field[1:] # Strip the '-'
else:
reverse = False # Reverse is inverted in Xapian -- http://trac.xapian.org/ticket/311
sorter.add(self.column(sort_field), reverse)
sorter.add(self.column[sort_field], reverse)
enquire.set_sort_by_key_then_relevance(sorter, True)
@ -760,7 +761,7 @@ class XapianSearchBackend(BaseSearchBackend):
"""
spies = []
for facet in facets:
slot = self.column(facet)
slot = self.column[facet]
spy = xapian.ValueCountMatchSpy(slot)
# add attribute "slot" to know which column this spy is targeting.
spy.slot = slot
@ -1111,7 +1112,7 @@ class XapianSearchQuery(BaseSearchQuery):
filter_type = None
else:
# get the field_type from the backend
field_type = self.backend.schema[self.backend.column(field_name)]['type']
field_type = self.backend.schema[self.backend.column[field_name]]['type']
# private fields don't accept 'contains' or 'startswith'
# since they have no meaning.