@@ -60,12 +60,13 @@ def render(template_name, **kwargs):
6060def index():
6161 global categories
6262 if request.method=='POST':
63− if not request.form.get('q'):
64− flash('Wrong post data')
65− return render('index.html')
63+ request_data = request.form
64+ else:
65+ request_data = request.args
66+ if request_data.get('q'):
6667 selected_engines = []
6768 selected_categories = []
68− for pd_name,pd in request.form.items():
69+ for pd_name,pd in request_data.items():
6970 if pd_name.startswith('category_'):
7071 category = pd_name[9:]
7172 if not category in categories:
@@ -81,9 +82,9 @@ def index():
8182 if not len(selected_engines):
8283 selected_categories.append('general')
8384 selected_engines.extend(x.name for x in categories['general'])
84− query = request.form['q'].encode('utf-8')
85+ query = request_data['q'].encode('utf-8')
8586 results = search(query, request, selected_engines)
86− if request.form.get('format') == 'json':
87+ if request_data.get('format') == 'json':
8788 # TODO HTTP headers
8889 return json.dumps({'query': query, 'results': results})
8990 template = render('results.html'