c19b089 · searx · git.iko.soy

on master help sign in

[fix] little autocompleter fix

c19b089Thomas Pointhuber12 years ago

searx/autocomplete.py+2−2

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

53 # check if query starts with engine name

54 for engine in engines:

55− if engine.startswith(engine_query):

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

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

58 # check if query starts with engine shortcut

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

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

88 # check if query starts with country

89− if country.startswith(engine_query):

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

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

92 # remove duplicates

searx/webapp.py+4−2

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

355 # parse searx specific autocompleter results like !bang

356 raw_results = searx_bang(query)

357

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

359+ if len(raw_results) <= 3:

358− # run autocompletion

360+ # run autocompletion

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

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

360

362

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

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

362 results = []

364 results = []