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

Removed _meta calls by using the haystack 'get_model_ct'.

Browse source
This commit is contained in:
Jorge C. Leitão 2014-05-11 08:12:26 +02:00
parent 5ef9ceb192
commit 4874fffc3d
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xapian_backend.py
View file

@ -15,7 +15,7 @@ from haystack.backends import BaseEngine, BaseSearchBackend, BaseSearchQuery, Se
from haystack.constants import ID
from haystack.exceptions import HaystackError, MissingDependency
from haystack.models import SearchResult
from haystack.utils import get_identifier
from haystack.utils import get_identifier, get_model_ct
try:
import xapian
@ -290,8 +290,7 @@ class XapianSearchBackend(BaseSearchBackend):
))
document.add_term(document_id)
document.add_term(
DOCUMENT_CT_TERM_PREFIX + u'%s.%s' %
(obj._meta.app_label, obj._meta.module_name)
DOCUMENT_CT_TERM_PREFIX + get_model_ct(obj)
)
database.replace_document(document_id, document)
@ -338,8 +337,7 @@ class XapianSearchBackend(BaseSearchBackend):
database = self._database(writable=True)
for model in models:
database.delete_document(
DOCUMENT_CT_TERM_PREFIX + '%s.%s' %
(model._meta.app_label, model._meta.module_name)
DOCUMENT_CT_TERM_PREFIX + get_model_ct(model)
)
database.close()
@ -954,9 +952,9 @@ class XapianSearchQuery(BaseSearchQuery):
if self.models:
subqueries = [
xapian.Query(
xapian.Query.OP_SCALE_WEIGHT, xapian.Query('%s%s.%s' % (
xapian.Query.OP_SCALE_WEIGHT, xapian.Query('%s%s' % (
DOCUMENT_CT_TERM_PREFIX,
model._meta.app_label, model._meta.module_name
get_model_ct(model)
)
), 0 # Pure boolean sub-query
) for model in self.models