Download as
Browse Code »

Commit e6eb9a9f8c27f4559b238df3f30eb63e66575977

Authored by Gust
Committed by Sergio Oliveira
1 parent 2a4ab7a6
Exists in master and in 31 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Change AltParser if engine is whoosh 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
colab/search/forms.py
  Diff comments   View file @e6eb9a9
@@ -7,6 +7,7 @@ from django.conf import settings @@ -7,6 +7,7 @@ from django.conf import settings
7 from django.utils.translation import ugettext_lazy as _ 7 from django.utils.translation import ugettext_lazy as _
8 from haystack.forms import SearchForm 8 from haystack.forms import SearchForm
9 from haystack.inputs import AltParser 9 from haystack.inputs import AltParser
  10 +from haystack.inputs import AutoQuery
10 11
11 from colab.super_archives.models import MailingList 12 from colab.super_archives.models import MailingList
12 13
@@ -107,7 +108,11 @@ class ColabSearchForm(SearchForm): @@ -107,7 +108,11 @@ class ColabSearchForm(SearchForm):
107 'bf': 'recip(ms(NOW/HOUR,modified),3.16e-11,1,1)^10', 108 'bf': 'recip(ms(NOW/HOUR,modified),3.16e-11,1,1)^10',
108 } 109 }
109 110
110 - sqs = sqs.filter(content=AltParser('edismax', q, **dismax_opts)) 111 + if settings.HAYSTACK_CONNECTIONS['default']['ENGINE'] != \
  112 + 'haystack.backends.whoosh_backend.WhooshEngine':
  113 + sqs = sqs.filter(content=AltParser('edismax', q, **dismax_opts))
  114 + else:
  115 + sqs = sqs.filter(content=AutoQuery(q))
111 116
112 if self.cleaned_data['type']: 117 if self.cleaned_data['type']:
113 sqs = sqs.filter(type=self.cleaned_data['type']) 118 sqs = sqs.filter(type=self.cleaned_data['type'])