From b0ba367a1a575fbbd3d847bdbe39b6920d2f46e4 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Mon, 7 Jul 2014 13:59:27 +0200 Subject: [enh][mod] search refactor --- searx/webapp.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'searx/webapp.py') diff --git a/searx/webapp.py b/searx/webapp.py index 2264382fc..295f6f9f7 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -39,8 +39,7 @@ from flask import ( from flask.ext.babel import Babel, gettext, format_date from searx import settings, searx_dir from searx.engines import ( - search as do_search, categories, engines, get_engines_stats, - engine_shortcuts + categories, engines, get_engines_stats, engine_shortcuts ) from searx.utils import ( UnicodeWriter, highlight_content, html_to_text, get_themes @@ -191,12 +190,7 @@ def index(): 'index.html', ) - # TODO moar refactor - do_search integration into Search class - search.results, search.suggestions = do_search(search.query, - request, - search.engines, - search.pageno, - search.lang) + search.results, search.suggestions = search.search(request) for result in search.results: -- cgit v1.2.3