From 48bcfbe77b0ce7efa66b50818c3c549cf59020db Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Sat, 11 May 2019 23:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Des=E6=90=9C=E7=B4=A2=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DjangoBlog/elasticsearch_backend.py | 5 +++++ blog/documents.py | 2 +- blog/management/commands/build_index.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/DjangoBlog/elasticsearch_backend.py b/DjangoBlog/elasticsearch_backend.py index 67f12b9..5356eac 100644 --- a/DjangoBlog/elasticsearch_backend.py +++ b/DjangoBlog/elasticsearch_backend.py @@ -100,6 +100,7 @@ class ElasticSearchBackend(BaseSearchBackend): raw_results.append(result) facets = {} spelling_suggestion = None + return { 'results': raw_results, 'hits': hits, @@ -143,6 +144,10 @@ class ElasticSearchQuery(BaseSearchQuery): def build_query_fragment(self, field, filter_type, value): return value.query_string + def get_count(self): + results = self.get_results() + return len(results) if results else 0 + class ElasticSearchEngine(BaseEngine): backend = ElasticSearchBackend diff --git a/blog/documents.py b/blog/documents.py index 40c347a..d282059 100644 --- a/blog/documents.py +++ b/blog/documents.py @@ -97,7 +97,7 @@ class ArticleDocumentManager(): def create_index(self): ArticleDocument.init() - def deleate_index(self): + def delete_index(self): from elasticsearch import Elasticsearch es = Elasticsearch() es.indices.delete(index='blog', ignore=[400, 404]) diff --git a/blog/management/commands/build_index.py b/blog/management/commands/build_index.py index 1beaa40..25dcd9c 100644 --- a/blog/management/commands/build_index.py +++ b/blog/management/commands/build_index.py @@ -23,5 +23,5 @@ class Command(BaseCommand): def handle(self, *args, **options): manager = ArticleDocumentManager() - manager.deleate_index() + manager.delete_index() manager.rebuild()