git.iko.soy/searx
on master help sign in
[mod] replace references request.request_data (GET or POST parameters) by request.form (based on merge of POST and GET parameters)
commit58a6c045c81a84abfb8a29368e7d5453efc5f2fa authorAlexandre Flament <alex@al-f.net> dateWed 2 Nov 2016, 14:52 (10 years ago) parentfbb080f
2 files changed+13−23
compare with master
unifiedsplit
searx/search.py+6−6 searx/webapp.py+7−17
searx/search.py+6−6
@@ -128,7 +128,7 @@ def make_callback(engine_name, callback, params, result_container):
128128 return process_callback
129129
130130
131−def get_search_query_from_webapp(preferences, request_data):
131+def get_search_query_from_webapp(preferences, form):
132132 query = None
133133 query_engines = []
134134 query_categories = []
@@ -147,11 +147,11 @@ def get_search_query_from_webapp(preferences, request_data):
147147 query_safesearch = preferences.get_value('safesearch')
148148
149149 # TODO better exceptions
150− if not request_data.get('q'):
150+ if not form.get('q'):
151151 raise Exception('noquery')
152152
153153 # set pagenumber
154− pageno_param = request_data.get('pageno', '1')
154+ pageno_param = form.get('pageno', '1')
155155 if not pageno_param.isdigit() or int(pageno_param) < 1:
156156 pageno_param = 1
157157
@@ -159,7 +159,7 @@ def get_search_query_from_webapp(preferences, request_data):
159159
160160 # parse query, if tags are set, which change
161161 # the serch engine or search-language
162− raw_text_query = RawTextQuery(request_data['q'], disabled_engines)
162+ raw_text_query = RawTextQuery(form['q'], disabled_engines)
163163 raw_text_query.parse_query()
164164
165165 # set query
@@ -170,7 +170,7 @@ def get_search_query_from_webapp(preferences, request_data):
170170 if len(raw_text_query.languages):
171171 query_lang = raw_text_query.languages[-1]
172172
173− query_time_range = request_data.get('time_range')
173+ query_time_range = form.get('time_range')
174174
175175 query_engines = raw_text_query.engines
176176
@@ -185,7 +185,7 @@ def get_search_query_from_webapp(preferences, request_data):
185185 else:
186186 # set categories/engines
187187 load_default_categories = True
188− for pd_name, pd in request_data.items():
188+ for pd_name, pd in form.items():
189189 if pd_name == 'categories':
190190 query_categories.extend(categ for categ in map(unicode.strip, pd.split(',')) if categ in categories)
191191 elif pd_name == 'engines':
searx/webapp.py+7−17
@@ -364,16 +364,6 @@ def render(template_name, override_theme=None, **kwargs):
364364
365365@app.before_request
366366def pre_request():
367− # request.request_data
368− if request.method == 'POST':
369− request_data = request.form
370− elif request.method == 'GET':
371− request_data = request.args
372− else:
373− request_data = {}
374−
375− request.request_data = request_data
376−
377367 # merge GET, POST vars
378368 preferences = Preferences(themes, categories.keys(), engines, plugins)
379369 try:
@@ -416,7 +406,7 @@ def index():
416406 search_query = None
417407 result_container = None
418408 try:
419− search_query = get_search_query_from_webapp(request.preferences, request.request_data)
409+ search_query = get_search_query_from_webapp(request.preferences, request.form)
420410 # search = Search(search_query) # without plugins
421411 search = SearchWithPlugins(search_query, request)
422412 result_container = search.search()
@@ -428,8 +418,8 @@ def index():
428418 results = result_container.get_ordered_results()
429419
430420 # UI
431− advanced_search = request.request_data.get('advanced_search', None)
432− output_format = request.request_data.get('format', 'html')
421+ advanced_search = request.form.get('advanced_search', None)
422+ output_format = request.form.get('format', 'html')
433423 if output_format not in ['html', 'csv', 'json', 'rss']:
434424 output_format = 'html'
435425
@@ -490,7 +480,7 @@ def index():
490480 response_rss = render(
491481 'opensearch_response_rss.xml',
492482 results=results,
493− q=request.request_data['q'],
483+ q=request.form['q'],
494484 number_of_results=number_of_results,
495485 base_url=get_base_url()
496486 )
@@ -499,7 +489,7 @@ def index():
499489 return render(
500490 'results.html',
501491 results=results,
502− q=request.request_data['q'],
492+ q=request.form['q'],
503493 selected_categories=search_query.categories,
504494 pageno=search_query.pageno,
505495 time_range=search_query.time_range,
@@ -531,7 +521,7 @@ def autocompleter():
531521 disabled_engines = request.preferences.engines.get_disabled()
532522
533523 # parse query
534− raw_text_query = RawTextQuery(request.request_data.get('q', '').encode('utf-8'), disabled_engines)
524+ raw_text_query = RawTextQuery(request.form.get('q', '').encode('utf-8'), disabled_engines)
535525 raw_text_query.parse_query()
536526
537527 # check if search query is set
@@ -564,7 +554,7 @@ def autocompleter():
564554 results.append(raw_text_query.getFullQuery())
565555
566556 # return autocompleter results
567− if request.request_data.get('format') == 'x-suggestions':
557+ if request.form.get('format') == 'x-suggestions':
568558 return Response(json.dumps([raw_text_query.query, results]),
569559 mimetype='application/json')
570560