From bfdd0c8a9f2460793c0fe743e23e930efe9ef121 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 22 Jan 2013 23:11:17 -0300 Subject: fixed one bug in the language-specific search in the multilingual setup --- askbot/search/postgresql/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/askbot/search/postgresql/__init__.py b/askbot/search/postgresql/__init__.py index 9720a7bb..4e359cc1 100644 --- a/askbot/search/postgresql/__init__.py +++ b/askbot/search/postgresql/__init__.py @@ -43,6 +43,9 @@ def run_full_text_search(query_set, query_text, text_search_vector_name): text_search_vector_name + \ ' @@ plainto_tsquery(%s)' + if getattr(django_settings, 'ASKBOT_MULTILINGUAL', True): + where_clause += " AND language_code='" + get_language() + "'" + search_query = '&'.join(query_text.split())#apply "AND" operator extra_params = (search_query,) extra_kwargs = { @@ -51,8 +54,6 @@ def run_full_text_search(query_set, query_text, text_search_vector_name): 'params': extra_params, 'select_params': extra_params, } - if getattr(django_settings, 'ASKBOT_MULTILINGUAL', True): - extra_kwargs['select']['language_code'] = get_language() return query_set.extra(**extra_kwargs) -- cgit v1.2.3-1-g7c22