From b2844a32252eebd72604a5a68c0f59ba3ca86d87 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 20 Jun 2014 11:01:19 +0100 Subject: [PATCH] Renamed a couple of methods on ElasticSearchResults --- wagtail/wagtailsearch/backends/elasticsearch.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 434a4e380..c47427d35 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -112,7 +112,7 @@ class ElasticSearchResults(object): self.query = query self.prefetch_related = prefetch_related - def _get_results_pks(self, offset=0, limit=None): + def _do_search(self, offset=0, limit=None): # Params for elasticsearch query params = dict( index=self.backend.es_index, @@ -134,7 +134,7 @@ class ElasticSearchResults(object): # ElasticSearch 1.x likes to pack pks into lists, unpack them if this has happened return [pk[0] if isinstance(pk, list) else pk for pk in pks] - def _get_count(self): + def _do_count(self): query = self.query.to_es() # Elasticsearch 1.x @@ -155,7 +155,7 @@ class ElasticSearchResults(object): def __getitem__(self, key): if isinstance(key, slice): # Get primary keys - pk_list_unclean = self._get_results_pks(key.start, key.stop - key.start) + pk_list_unclean = self._do_search(key.start, key.stop - key.start) # Remove duplicate keys (and preserve order) seen_pks = set() @@ -182,11 +182,11 @@ class ElasticSearchResults(object): return results_sorted else: # Return a single item - pk = self._get_results_pks(key, key + 1)[0] + pk = self._do_search(key, key + 1)[0] return self.query.model.objects.get(pk=pk) def __len__(self): - return self._get_count() + return self._do_count() class ElasticSearch(BaseSearch):