|
@@ -364,16 +364,6 @@ def render(template_name, override_theme=None, **kwargs):
|
364
|
364
|
|
365
|
365
|
@app.before_request
|
366
|
366
|
def 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
|
|
-
|
377
|
367
|
# merge GET, POST vars
|
378
|
368
|
preferences = Preferences(themes, categories.keys(), engines, plugins)
|
379
|
369
|
try:
|
|
@@ -416,7 +406,7 @@ def index():
|
416
|
406
|
search_query = None
|
417
|
407
|
result_container = None
|
418
|
408
|
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)
|
420
|
410
|
# search = Search(search_query) # without plugins
|
421
|
411
|
search = SearchWithPlugins(search_query, request)
|
422
|
412
|
result_container = search.search()
|
|
@@ -428,8 +418,8 @@ def index():
|
428
|
418
|
results = result_container.get_ordered_results()
|
429
|
419
|
|
430
|
420
|
# 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')
|
433
|
423
|
if output_format not in ['html', 'csv', 'json', 'rss']:
|
434
|
424
|
output_format = 'html'
|
435
|
425
|
|
|
@@ -490,7 +480,7 @@ def index():
|
490
|
480
|
response_rss = render(
|
491
|
481
|
'opensearch_response_rss.xml',
|
492
|
482
|
results=results,
|
493
|
|
- q=request.request_data['q'],
|
|
483
|
+ q=request.form['q'],
|
494
|
484
|
number_of_results=number_of_results,
|
495
|
485
|
base_url=get_base_url()
|
496
|
486
|
)
|
|
@@ -499,7 +489,7 @@ def index():
|
499
|
489
|
return render(
|
500
|
490
|
'results.html',
|
501
|
491
|
results=results,
|
502
|
|
- q=request.request_data['q'],
|
|
492
|
+ q=request.form['q'],
|
503
|
493
|
selected_categories=search_query.categories,
|
504
|
494
|
pageno=search_query.pageno,
|
505
|
495
|
time_range=search_query.time_range,
|
|
@@ -531,7 +521,7 @@ def autocompleter():
|
531
|
521
|
disabled_engines = request.preferences.engines.get_disabled()
|
532
|
522
|
|
533
|
523
|
# 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)
|
535
|
525
|
raw_text_query.parse_query()
|
536
|
526
|
|
537
|
527
|
# check if search query is set
|
|
@@ -564,7 +554,7 @@ def autocompleter():
|
564
|
554
|
results.append(raw_text_query.getFullQuery())
|
565
|
555
|
|
566
|
556
|
# return autocompleter results
|
567
|
|
- if request.request_data.get('format') == 'x-suggestions':
|
|
557
|
+ if request.form.get('format') == 'x-suggestions':
|
568
|
558
|
return Response(json.dumps([raw_text_query.query, results]),
|
569
|
559
|
mimetype='application/json')
|
570
|
560
|
|