@@ -26,6 +26,7 @@ from flask import Flask, request, flash, render_template, url_for, Response
26import ConfigParser
26import ConfigParser
27from os import getenv
27from os import getenv
28from searx.engines import search, engines
28from searx.engines import search, engines
30cfg = ConfigParser.SafeConfigParser()
31cfg = ConfigParser.SafeConfigParser()
31cfg.read('/etc/searx.conf')
32cfg.read('/etc/searx.conf')
@@ -67,6 +68,9 @@ def index():
67 selected_engines = engines.keys()
68 selected_engines = engines.keys()
68 query = request.form['q'].encode('utf-8')
69 query = request.form['q'].encode('utf-8')
69 results = search(query, request, selected_engines)
70 results = search(query, request, selected_engines)
71+ if request.form.get('format') == 'json':
73+ return json.dumps({'query': query, 'results': results})
70 return render('results.html', results=results, q=query.decode('utf-8'))
74 return render('results.html', results=results, q=query.decode('utf-8'))
71 return render('index.html')
75 return render('index.html')