c19b089 · searx · git.iko.soy

git.iko.soy/searx

[fix] little autocompleter fix

commitc19b0899a415fa3be7c1f30258c218868ef0b671 authorThomas Pointhuber <thomas.pointhuber@gmx.at> dateSat 10 Jan 2015, 19:55 (12 years ago) parenteb6f334

2 files changed+6−4

compare with master

unifiedsplit

searx/autocomplete.py+2−2 searx/webapp.py+4−2

searx/autocomplete.py+2−2

@@ -52,7 +52,7 @@ def searx_bang(full_query):

5252

5353 # check if query starts with engine name

5454 for engine in engines:

55− if engine.startswith(engine_query):

55+ if engine.startswith(engine_query.replace('_', ' ')):

5656 results.append('!{engine}'.format(engine=engine.replace(' ', '_')))

5757

5858 # check if query starts with engine shortcut

@@ -86,7 +86,7 @@ def searx_bang(full_query):

8686 results.append(':{lang_name}'.format(lang_name=lang_name))

8787

8888 # check if query starts with country

89− if country.startswith(engine_query):

89+ if country.startswith(engine_query.replace('_', ' ')):

9090 results.append(':{country}'.format(country=country.replace(' ', '_')))

9191

9292 # remove duplicates

searx/webapp.py+4−2

@@ -355,8 +355,10 @@ def autocompleter():

355355 # parse searx specific autocompleter results like !bang

356356 raw_results = searx_bang(query)

357357

358− # run autocompletion

359− raw_results.extend(completer(query.getSearchQuery()))

358+ # normal autocompletion results only appear if max 3. searx results returned

359+ if len(raw_results) <= 3:

360+ # run autocompletion

361+ raw_results.extend(completer(query.getSearchQuery()))

360362

361363 # parse results (write :language and !engine back to result string)

362364 results = []