summaryrefslogtreecommitdiff
path: root/searx/webadapter.py
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2020-12-18 12:19:14 +0100
committerAlexandre Flament <alex@al-f.net>2020-12-18 12:29:48 +0100
commiteda8934f1548ed228d00a0196b61d35585ea11bc (patch)
treeac81fbe1a6154ad9338da92494bc9f9e3decdd75 /searx/webadapter.py
parent995ba2f40643bd01134902eca91cacf0bab1ebdc (diff)
downloadsearxng-eda8934f1548ed228d00a0196b61d35585ea11bc.tar.gz
searxng-eda8934f1548ed228d00a0196b61d35585ea11bc.zip
[mod] searx.search.EngineRef: remove from_bang parameter
from_bang is True when the user query contains a bang. In this case the category is also set to 'none'. from_bang only usage was in searx.webadapter.parse_specific : if from_bang is True, then the EngineRef category is ignored and force to 'none'. This commit also removes the searx.webadapter.parse_sepecific function.
Diffstat (limited to 'searx/webadapter.py')
-rw-r--r--searx/webadapter.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/searx/webadapter.py b/searx/webadapter.py
index 7bec42651..0ad82c62c 100644
--- a/searx/webadapter.py
+++ b/searx/webadapter.py
@@ -109,17 +109,6 @@ def parse_timeout(form: Dict[str, str], raw_text_query: RawTextQuery) -> Optiona
raise SearxParameterException('timeout_limit', timeout_limit)
-def parse_specific(raw_text_query: RawTextQuery) -> Tuple[List[EngineRef], List[str]]:
- query_engineref_list = raw_text_query.enginerefs
- additional_categories = set()
- for engineref in raw_text_query.enginerefs:
- if engineref.from_bang:
- additional_categories.add('none')
- else:
- additional_categories.add(engineref.category)
- return query_engineref_list
-
-
def parse_category_form(query_categories: List[str], name: str, value: str) -> None:
if name == 'categories':
query_categories.extend(categ for categ in map(str.strip, value.split(',')) if categ in categories)
@@ -232,7 +221,7 @@ def get_search_query_from_webapp(preferences: Preferences, form: Dict[str, str])
if not is_locked('categories') and raw_text_query.enginerefs and raw_text_query.specific:
# if engines are calculated from query,
# set categories by using that informations
- query_engineref_list = parse_specific(raw_text_query)
+ query_engineref_list = raw_text_query.enginerefs
else:
# otherwise, using defined categories to
# calculate which engines should be used