@@ -52,6 +52,7 @@ from flask import (
5252from flask_babel import Babel, gettext, format_date, format_decimal
5353from flask.json import jsonify
5454from searx import settings, searx_dir, searx_debug
55+from searx.exceptions import SearxException, SearxParameterException
5556from searx.engines import (
5657 categories, engines, engine_shortcuts, get_engines_stats, initialize_engines
5758)
@@ -226,7 +227,7 @@ def get_current_theme_name(override=None):
226227 2. cookies
227228 3. settings"""
228229
229− if override and override in themes:
230+ if override and (override in themes or override == '__common__'):
230231 return override
231232 theme_name = request.args.get('theme', request.preferences.get_value('theme'))
232233 if theme_name not in themes:
@@ -400,6 +401,33 @@ def pre_request():
400401 request.user_plugins.append(plugin)
401402
402403
404+def index_error(output_format, error_message):
405+ if output_format == 'json':
406+ return Response(json.dumps({'error': error_message}),
407+ mimetype='application/json')
408+ elif output_format == 'csv':
409+ response = Response('', mimetype='application/csv')
410+ cont_disp = 'attachment;Filename=searx.csv'
411+ response.headers.add('Content-Disposition', cont_disp)
412+ return response
413+ elif output_format == 'rss':
414+ response_rss = render(
415+ 'opensearch_response_rss.xml',
416+ results=[],
417+ q=request.form['q'] if 'q' in request.form else '',
418+ number_of_results=0,
419+ base_url=get_base_url(),
420+ error_message=error_message
421+ )
422+ return Response(response_rss, mimetype='text/xml')
423+ else:
424+ # html
425+ request.errors.append(gettext('search error'))
426+ return render(
427+ 'index.html',
428+ )
429+
430+
403431@app.route('/search', methods=['GET', 'POST'])
404432@app.route('/', methods=['GET', 'POST'])
405433def index():
@@ -408,10 +436,19 @@ def index():
408436 Supported outputs: html, json, csv, rss.
409437 """
410438
439+ # output_format
440+ output_format = request.form.get('format', 'html')
441+ if output_format not in ['html', 'csv', 'json', 'rss']:
442+ output_format = 'html'
443+
444+ # check if there is query
411445 if request.form.get('q') is None:
412− return render(
413− 'index.html',
414− )
446+ if output_format == 'html':
447+ return render(
448+ 'index.html',
449+ )
450+ else:
451+ return index_error(output_format, 'No query'), 400
415452
416453 # search
417454 search_query = None
@@ -421,20 +458,24 @@ def index():
421458 # search = Search(search_query) # without plugins
422459 search = SearchWithPlugins(search_query, request.user_plugins, request)
423460 result_container = search.search()
424− except:
425− request.errors.append(gettext('search error'))
461+ except Exception as e:
462+ # log exception
426463 logger.exception('search error')
427− return render(
428− 'index.html',
429− )
430464
465+ # is it an invalid input parameter or something else ?
466+ if (issubclass(e.__class__, SearxParameterException)):
467+ return index_error(output_format, e.message), 400
468+ else:
469+ return index_error(output_format, gettext('search error')), 500
470+
471+ # results
431472 results = result_container.get_ordered_results()
473+ number_of_results = result_container.results_number()
474+ if number_of_results < result_container.results_length():
475+ number_of_results = 0
432476
433477 # UI
434478 advanced_search = request.form.get('advanced_search', None)
435− output_format = request.form.get('format', 'html')
436− if output_format not in ['html', 'csv', 'json', 'rss']:
437− output_format = 'html'
438479
439480 # output
440481 for result in results:
@@ -470,15 +511,12 @@ def index():
470511 else:
471512 result['publishedDate'] = format_date(result['publishedDate'])
472513
473− number_of_results = result_container.results_number()
474− if number_of_results < result_container.results_length():
475− number_of_results = 0
476−
477514 if output_format == 'json':
478515 return Response(json.dumps({'query': search_query.query,
479516 'number_of_results': number_of_results,
480517 'results': results,
481518 'answers': list(result_container.answers),
519+ 'corrections': list(result_container.corrections),
482520 'infoboxes': result_container.infoboxes,
483521 'suggestions': list(result_container.suggestions)}),
484522 mimetype='application/json')
@@ -500,7 +538,8 @@ def index():
500538 results=results,
501539 q=request.form['q'],
502540 number_of_results=number_of_results,
503− base_url=get_base_url()
541+ base_url=get_base_url(),
542+ override_theme='__common__',
504543 )
505544 return Response(response_rss, mimetype='text/xml')
506545
@@ -515,6 +554,7 @@ def index():
515554 advanced_search=advanced_search,
516555 suggestions=result_container.suggestions,
517556 answers=result_container.answers,
557+ corrections=result_container.corrections,
518558 infoboxes=result_container.infoboxes,
519559 paging=result_container.paging,
520560 current_language=search_query.lang,
@@ -720,7 +760,8 @@ def opensearch():
720760 ret = render('opensearch.xml',
721761 opensearch_method=method,
722762 host=get_base_url(),
723− urljoin=urljoin)
763+ urljoin=urljoin,
764+ override_theme='__common__')
724765
725766 resp = Response(response=ret,
726767 status=200,