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

Merge pull request #80 from blodone/master

Browse source 
backend specification
This commit is contained in:
Dave Hall 2014-12-02 11:44:04 +00:00
commit 3cae3068b1
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/watson/registration.py
View file

@ -526,7 +526,7 @@ class SearchEngine(object):
else:
yield queryset.all()
def search(self, search_text, models=(), exclude=(), ranking=True):
def search(self, search_text, models=(), exclude=(), ranking=True, backend_name=None):
"""Performs a search using the given text, returning a queryset of SearchEntry."""
# Check for blank search text.
search_text = search_text.strip()
@ -543,7 +543,7 @@ class SearchEngine(object):
self._create_model_filter(exclude)
)
# Perform the backend-specific full text match.
backend = get_backend()
backend = get_backend(backend_name=backend_name)
queryset = backend.do_search(self._engine_slug, queryset, search_text)
# Perform the backend-specific full-text ranking.
if ranking:
@ -551,7 +551,7 @@ class SearchEngine(object):
# Return the complete queryset.
return queryset
def filter(self, queryset, search_text, ranking=True):
def filter(self, queryset, search_text, ranking=True, backend_name=None):
"""
Filters the given model or queryset using the given text, returning the
modified queryset.
@ -564,7 +564,7 @@ class SearchEngine(object):
if not search_text:
return queryset
# Perform the backend-specific full text match.
backend = get_backend()
backend = get_backend(backend_name=backend_name)
queryset = backend.do_filter(self._engine_slug, queryset, search_text)
# Perform the backend-specific full-text ranking.
if ranking:
@ -581,14 +581,15 @@ default_search_engine = SearchEngine("default")
_backend_cache = None
def get_backend():
def get_backend(backend_name=None):
"""Initializes and returns the search backend."""
global _backend_cache
# Try to use the cached backend.
if _backend_cache is not None:
return _backend_cache
# Load the backend class.
backend_name = getattr(settings, "WATSON_BACKEND", "watson.backends.AdaptiveSearchBackend")
if not backend_name:
backend_name = getattr(settings, "WATSON_BACKEND", "watson.backends.AdaptiveSearchBackend")
backend_module_name, backend_cls_name = backend_name.rsplit(".", 1)
backend_module = import_module(backend_module_name)
try: