on master help sign in
[enh] always enable inner autocompletition (server side only)
commit78081baa8fa311c052f41f3d39e3cb0a30b539f1 authorAdam Tauber <asciimoo@gmail.com> dateSun 25 Jan 2015, 22:52 (12 years ago) parent516ea9b
1 file changed+7−12
searx/webapp.py+7−12
searx/webapp.py+7−12
@@ -429,34 +429,29 @@ def autocompleter():
429429 # run autocompleter
430430 completer = autocomplete_backends.get(request.cookies.get('autocomplete'))
431431
432− # check if valid autocompleter is selected
433− if not completer:
434− return '', 400
435−
436432 # parse searx specific autocompleter results like !bang
437433 raw_results = searx_bang(query)
438434
439− # normal autocompletion results only appear if max 3. searx results returned
440− if len(raw_results) <= 3:
435+ # normal autocompletion results only appear if max 3 inner results returned
436+ if len(raw_results) <= 3 and completer:
441437 # run autocompletion
442438 raw_results.extend(completer(query.getSearchQuery()))
443439
444440 # parse results (write :language and !engine back to result string)
445441 results = []
446442 for result in raw_results:
447− result_query = query
448− result_query.changeSearchQuery(result)
443+ query.changeSearchQuery(result)
449444
450445 # add parsed result
451− results.append(result_query.getFullQuery())
446+ results.append(query.getFullQuery())
452447
453448 # return autocompleter results
454449 if request_data.get('format') == 'x-suggestions':
455450 return Response(json.dumps([query.query, results]),
456451 mimetype='application/json')
457− else:
458− return Response(json.dumps(results),
459− mimetype='application/json')
452+
453+ return Response(json.dumps(results),
454+ mimetype='application/json')
460455
461456
462457@app.route('/preferences', methods=['GET', 'POST'])