ungleich-public/djangocms_blog
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #303 from nephila/hotfix/haystack

Browse source 
Set the correct language during indexing
This commit is contained in:
Iacopo Spalletti 2016-07-13 07:19:47 +02:00 committed by GitHub
commit 80c557ed0f
3 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
HISTORY.rst
View file

@ -4,6 +4,12 @@
History History
======= =======
******************
0.8.6 (unreleased)
******************
* Set the correct language during indexing
****************** ******************
0.8.5 (2016-06-26) 0.8.5 (2016-06-26)
****************** ******************

62
djangocms_blog/search_indexes.py
View file

@ -3,6 +3,7 @@ from aldryn_search.helpers import get_plugin_index_data
from aldryn_search.utils import get_index_base, strip_tags from aldryn_search.utils import get_index_base, strip_tags
from django.utils.encoding import force_text from django.utils.encoding import force_text
from haystack import indexes from haystack import indexes
from parler.utils.context import switch_language
from .models import Post from .models import Post
from .settings import get_setting from .settings import get_setting
@ -44,36 +45,37 @@ class PostIndex(get_index_base()):
return Post return Post
def get_search_data(self, post, language, request): def get_search_data(self, post, language, request):
description = post.get_description() with switch_language(post, language):
abstract = strip_tags(post.safe_translation_getter('abstract', default='')) description = post.get_description()
keywords = post.get_keywords() abstract = strip_tags(post.safe_translation_getter('abstract', default=''))
keywords = post.get_keywords()
text_bits = [] text_bits = []
if abstract: if abstract:
text_bits.append(abstract) text_bits.append(abstract)
if description: if description:
text_bits.append(description) text_bits.append(description)
if keywords: if keywords:
text_bits.append(' '.join(keywords)) text_bits.append(' '.join(keywords))
self.prepared_data['keywords'] = ','.join(keywords) self.prepared_data['keywords'] = ','.join(keywords)
for category in post.categories.all(): for category in post.categories.all():
text_bits.append( text_bits.append(
force_text(category.safe_translation_getter('name'))) force_text(category.safe_translation_getter('name')))
for tag in post.tags.all(): for tag in post.tags.all():
text_bits.append(force_text(tag.name)) text_bits.append(force_text(tag.name))
if get_setting('USE_PLACEHOLDER'): if get_setting('USE_PLACEHOLDER'):
plugins = post.content.cmsplugin_set.filter(language=language) plugins = post.content.cmsplugin_set.filter(language=language)
content_bits = [] content_bits = []
for base_plugin in plugins: for base_plugin in plugins:
content = get_plugin_index_data(base_plugin, request) content = get_plugin_index_data(base_plugin, request)
content_bits.append(' '.join(content)) content_bits.append(' '.join(content))
post_text = ' '.join(content_bits) post_text = ' '.join(content_bits)
else: else:
post_text = post.safe_translation_getter('post_text') post_text = post.safe_translation_getter('post_text')
if post_text: if post_text:
post_text = strip_tags(post_text) post_text = strip_tags(post_text)
self.prepared_data['post_text'] = post_text self.prepared_data['post_text'] = post_text
text_bits.append(post_text) text_bits.append(post_text)
return ' '.join(text_bits) return ' '.join(text_bits)

4
tox.ini
View file

@ -10,18 +10,22 @@ deps =
django16: django-mptt<0.8 django16: django-mptt<0.8
django16: django-filer<1.2 django16: django-filer<1.2
django16: cmsplugin-filer<1.1 django16: cmsplugin-filer<1.1
django16: django-haystack<2.5
django17: Django>=1.7,<1.8 django17: Django>=1.7,<1.8
django17: django-mptt<0.8 django17: django-mptt<0.8
django17: django-filer<1.3 django17: django-filer<1.3
django17: cmsplugin-filer<1.2 django17: cmsplugin-filer<1.2
django17: django-haystack
django18: Django>=1.8,<1.9 django18: Django>=1.8,<1.9
django18: django-mptt>=0.8 django18: django-mptt>=0.8
django18: django-filer<1.3 django18: django-filer<1.3
django18: cmsplugin-filer<1.2 django18: cmsplugin-filer<1.2
django18: django-haystack
django19: Django>=1.9,<1.10 django19: Django>=1.9,<1.10
django19: django-mptt>=0.8 django19: django-mptt>=0.8
django19: django-filer<1.3 django19: django-filer<1.3
django19: cmsplugin-filer<1.2 django19: cmsplugin-filer<1.2
django19: django-haystack
cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip cms30: https://github.com/divio/django-cms/archive/release/3.0.x.zip
cms30: djangocms-text-ckeditor<2.8 cms30: djangocms-text-ckeditor<2.8
cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip cms31: https://github.com/divio/django-cms/archive/release/3.1.x.zip