From 257793dcd5184eb64e44be100fa36d91a100419f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 13 Mar 2018 12:21:41 +0100 Subject: [PATCH] Simplified some code --- pillar/api/search/routes.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pillar/api/search/routes.py b/pillar/api/search/routes.py index 941b9c33..62b21f01 100644 --- a/pillar/api/search/routes.py +++ b/pillar/api/search/routes.py @@ -18,12 +18,6 @@ TERMS = [ ] -def _valid_search() -> str: - """ Returns search parameters """ - query = request.args.get('q', '') - return query - - def _term_filters() -> dict: """ Check if frontent wants to filter stuff @@ -47,7 +41,7 @@ def _page_index() -> int: @blueprint_search.route('/') def search_nodes(): - searchword = _valid_search() + searchword = request.args.get('q', '') terms = _term_filters() page_idx = _page_index() @@ -57,7 +51,7 @@ def search_nodes(): @blueprint_search.route('/user') def search_user(): - searchword = _valid_search() + searchword = request.args.get('q', '') terms = _term_filters() page_idx = _page_index() # result is the raw elasticseach output. @@ -101,7 +95,7 @@ def search_user_admin(): User search over all fields. """ - searchword = _valid_search() + searchword = request.args.get('q', '') terms = _term_filters() page_idx = _page_index()