Backup

Former-commit-id: 009a44fb6bc0ea9a97891a975cf5ed01eae93076

diff --git a/env/debug.env b/env/debug.env
index 7a9fbbcc2efd668f22107e8e9316a87bd0755b0f..a19e34770877c2c4104fc1cee497ee521afd6e88 100644 (file)
--- a/env/debug.env
+++ b/env/debug.env
@@ -18,4 +18,4 @@ BROKER_URL=redis://broker:6379/0
 # If this is True, all tasks will be executed locally by blocking until the task returns.
 CELERY_ALWAYS_EAGER=False
 
-REINDEX=True
+REINDEX=False

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index db3eaf73edd0cb28458943f4c2921db3ed33c403..033327f8471c741587155f6076611bb113a29d2d 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -231,9 +231,9 @@ class HayAdvanceForm(SearchForm):
 
         if self.cleaned_data['item_status']:
             if self.cleaned_data.get('item_status') == 'pub':
-                sqs = sqs.filter(item_status='Published')
+                sqs = sqs.filter(item_status__exact='Published')
             if self.cleaned_data.get('item_status') == 'unpub':
-                sqs = sqs.filter(item_status='Unpublished')
+                sqs = sqs.filter(item_status__exact='Unpublished')
 
         if self.cleaned_data['media_type']:
             if self.cleaned_data.get('media_type') != '1':

diff --git a/telemeta/util/backend.py b/telemeta/util/backend.py
index 897f7adcab75e123bdc195b801811a7f7edefe10..b52e6023145c1f6819a133bf143e57f82d9ce479 100644 (file)
--- a/telemeta/util/backend.py
+++ b/telemeta/util/backend.py
@@ -6,16 +6,16 @@ class CustomElasticBackend(ElasticsearchSearchBackend):
 
     def setup(self):
 
-        DEFAULT_FIELD_MAPPING['analyzer']='trim_lower_analyzer'
+        DEFAULT_FIELD_MAPPING['analyzer']='space_lower_analyzer'
         eb = super(CustomElasticBackend, self)
-        eb.DEFAULT_SETTINGS.get('settings').get('analysis').get('analyzer')['trim_lower_analyzer']=\
-            {"type": "custom", "tokenizer": "keyword", "filter": ["trim", "lowercase", "asciifolding"]}
+        eb.DEFAULT_SETTINGS.get('settings').get('analysis').get('analyzer')['space_lower_analyzer']=\
+            {"type": "custom", "tokenizer": "whitespace", "filter": ["lowercase", "asciifolding"]}
         eb.setup()
 
 class CustomElasticSearchQuery(ElasticsearchSearchQuery):
 
     def build_query_fragment(self, field, filter_type, value):
-        print(field, ' ', filter_type, ' ', value)
+        #print(field, ' ', filter_type, ' ', value)
         valeur = super(CustomElasticSearchQuery, self).build_query_fragment(field, filter_type, value)
         #print(valeur)
         return valeur