lasers
/
searx
mirror of https://github.com/searx/searx
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[fix] never pass bangs to autocomplete suggestions

This commit is contained in:
Marc Abonce Seguin 2018-01-18 20:51:27 -06:00
parent 69c8ad86f3
commit 40272b0044
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
searx/autocomplete.py
View File

@ -16,6 +16,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
''' '''
import sys
from lxml import etree from lxml import etree
from json import loads from json import loads
from searx import settings from searx import settings
@ -26,6 +27,9 @@ from searx.engines import (
from searx.poolrequests import get as http_get from searx.poolrequests import get as http_get
from searx.url_utils import urlencode from searx.url_utils import urlencode
if sys.version_info[0] == 3:
unicode = str
def get(*args, **kwargs): def get(*args, **kwargs):
if 'timeout' not in kwargs: if 'timeout' not in kwargs:

7
searx/webapp.py
View File

@ -636,8 +636,11 @@ def autocompleter():
# parse searx specific autocompleter results like !bang # parse searx specific autocompleter results like !bang
raw_results = searx_bang(raw_text_query) raw_results = searx_bang(raw_text_query)
# normal autocompletion results only appear if max 3 inner results returned # normal autocompletion results only appear if no inner results returned
if len(raw_results) <= 3 and completer: # and there is a query part besides the engine and language bangs
if len(raw_results) == 0 and completer and (len(raw_text_query.query_parts) > 1 or
(len(raw_text_query.languages) == 0 and
not raw_text_query.specific)):
# get language from cookie # get language from cookie
language = request.preferences.get_value('language') language = request.preferences.get_value('language')
if not language or language == 'all': if not language or language == 'all':