diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-01-22 23:11:17 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-01-22 23:11:17 -0300 |
| commit | bfdd0c8a9f2460793c0fe743e23e930efe9ef121 (patch) | |
| tree | 991f6fbce6081dd90995f2981f0725b4c2725f52 | |
| parent | b569cee0c2e9a1d0516a23f1de63cf5d757466b7 (diff) | |
| download | askbot-bfdd0c8a9f2460793c0fe743e23e930efe9ef121.tar.gz askbot-bfdd0c8a9f2460793c0fe743e23e930efe9ef121.tar.bz2 askbot-bfdd0c8a9f2460793c0fe743e23e930efe9ef121.zip | |
fixed one bug in the language-specific search in the multilingual setup
| -rw-r--r-- | askbot/search/postgresql/__init__.py | 5 |
1 files 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) |