on master help sign in
Merge pull request #2127 from msafadieh/master
f3bfc19Alexandre Flament
searx/templates/__common__/opensearch.xml+1−1
@@ -13,6 +13,6 @@
13 </Url>
13 </Url>
14 {% endif %}
14 {% endif %}
15 {% if autocomplete %}
15 {% if autocomplete %}
16− <Url rel="suggestions" type="application/json" template="{{ host }}autocompleter"/>
16+ <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/>
17 {% endif %}
17 {% endif %}
18</OpenSearchDescription>
18</OpenSearchDescription>
searx/webapp.py+4−4
@@ -790,12 +790,12 @@ def autocompleter():
790 results.append(raw_text_query.getFullQuery())
790 results.append(raw_text_query.getFullQuery())
791
791
792 # return autocompleter results
792 # return autocompleter results
793− if request.form.get('format') == 'x-suggestions':
793+ if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
794− return Response(json.dumps([raw_text_query.query, results]),
794+ return Response(json.dumps(results),
795 mimetype='application/json')
795 mimetype='application/json')
796
796
797− return Response(json.dumps(results),
797+ return Response(json.dumps([raw_text_query.query, results]),
798− mimetype='application/json')
798+ mimetype='application/x-suggestions+json')
799
799
800
800
801@app.route('/preferences', methods=['GET', 'POST'])
801@app.route('/preferences', methods=['GET', 'POST'])