git.iko.soy/searx
on master help sign in
[fix] never pass bangs to autocomplete suggestions
commit40272b0044a2ef520ff9c3fb3513c5a340663f22 authorMarc Abonce Seguin <marc-abonce@mailbox.org> dateThu 18 Jan 2018, 20:51 (9 years ago) parent69c8ad8
2 files changed+9−2
compare with master
unifiedsplit
searx/autocomplete.py+4 searx/webapp.py+5−2
searx/autocomplete.py+4
@@ -16,6 +16,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
1616'''
1717
1818
19+import sys
1920from lxml import etree
2021from json import loads
2122from searx import settings
@@ -26,6 +27,9 @@ from searx.engines import (
2627from searx.poolrequests import get as http_get
2728from searx.url_utils import urlencode
2829
30+if sys.version_info[0] == 3:
31+ unicode = str
32+
2933
3034def get(*args, **kwargs):
3135 if 'timeout' not in kwargs:
searx/webapp.py+5−2
@@ -636,8 +636,11 @@ def autocompleter():
636636 # parse searx specific autocompleter results like !bang
637637 raw_results = searx_bang(raw_text_query)
638638
639− # normal autocompletion results only appear if max 3 inner results returned
640− if len(raw_results) <= 3 and completer:
639+ # normal autocompletion results only appear if no inner results returned
640+ # and there is a query part besides the engine and language bangs
641+ if len(raw_results) == 0 and completer and (len(raw_text_query.query_parts) > 1 or
642+ (len(raw_text_query.languages) == 0 and
643+ not raw_text_query.specific)):
641644 # get language from cookie
642645 language = request.preferences.get_value('language')
643646 if not language or language == 'all':