mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Moves PostgreSQL get_config to the search backend.

Browse Source
This commit is contained in:
Bertrand Bordage 2017-10-19 15:02:09 +01:00
parent 781263d4e1
commit 74aaa91ef6
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wagtail/contrib/postgres_search/backend.py
View File

@ -59,9 +59,6 @@ class Index(object):
.exclude(object_id__in=existing_pks))
stale_entries.delete()
def get_config(self):
return self.backend.params.get('SEARCH_CONFIG')
def prepare_value(self, value):
if isinstance(value, string_types):
return value
@ -150,7 +147,7 @@ class Index(object):
def add_items(self, model, objs):
content_type_pk = get_content_types_pk(model)
config = self.get_config()
config = self.backend.get_config()
for obj in objs:
obj._object_id = force_text(obj.pk)
obj._body_ = self.prepare_body(obj)
@ -225,17 +222,12 @@ class PostgresSearchQuery(BaseSearchQuery):
class PostgresSearchResults(BaseSearchResults):
def get_config(self):
queryset = self.query.queryset
return self.backend.get_index_for_model(
queryset.model, queryset._db).get_config()
def _do_search(self):
return list(self.query.search(self.get_config(),
return list(self.query.search(self.backend.get_config(),
self.start, self.stop))
def _do_count(self):
return self.query.search(self.get_config(), None, None).count()
return self.query.search(self.backend.get_config(), None, None).count()
class PostgresSearchRebuilder:
@ -285,6 +277,9 @@ class PostgresSearchBackend(BaseSearchBackend):
self.rebuilder_class = self.atomic_rebuilder_class
IndexEntry.add_generic_relations()
def get_config(self):
return self.params.get('SEARCH_CONFIG')
def get_index_for_model(self, model, db_alias=None):
return Index(self, model, db_alias)