archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Simplified some code

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-03-13 12:21:41 +01:00
parent 6e1d255dfc
commit 257793dcd5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pillar/api/search/routes.py
View File

@ -18,12 +18,6 @@ TERMS = [
] ]
def _valid_search() -> str:
""" Returns search parameters """
query = request.args.get('q', '')
return query
def _term_filters() -> dict: def _term_filters() -> dict:
""" """
Check if frontent wants to filter stuff Check if frontent wants to filter stuff
@ -47,7 +41,7 @@ def _page_index() -> int:
@blueprint_search.route('/') @blueprint_search.route('/')
def search_nodes(): def search_nodes():
searchword = _valid_search() searchword = request.args.get('q', '')
terms = _term_filters() terms = _term_filters()
page_idx = _page_index() page_idx = _page_index()
@ -57,7 +51,7 @@ def search_nodes():
@blueprint_search.route('/user') @blueprint_search.route('/user')
def search_user(): def search_user():
searchword = _valid_search() searchword = request.args.get('q', '')
terms = _term_filters() terms = _term_filters()
page_idx = _page_index() page_idx = _page_index()
# result is the raw elasticseach output. # result is the raw elasticseach output.
@ -101,7 +95,7 @@ def search_user_admin():
User search over all fields. User search over all fields.
""" """
searchword = _valid_search() searchword = request.args.get('q', '')
terms = _term_filters() terms = _term_filters()
page_idx = _page_index() page_idx = _page_index()