on master help sign in
Merge pull request #166 from Cqoicebordel/non-exclusif-bang

Add non exclusif bang

commitb47b8cc2c6cd3c746807a2fe955e956d43556081 authorAdam Tauber <asciimoo@gmail.com> dateMon 12 Jan 2015, 14:14 (12 years ago) parentd7ea44a96c4d52
2 files changed+6−2
searx/query.py+5−1 searx/search.py+1−1
searx/query.py+5−1
@@ -38,6 +38,7 @@ class Query(object):
3838 self.query_parts = []
3939 self.engines = []
4040 self.languages = []
41+ self.specific = False
4142
4243 # parse query, if tags are set, which
4344 # change the serch engine or search-language
@@ -83,7 +84,7 @@ class Query(object):
8384 break
8485
8586 # this force a engine or category
86− if query_part[0] == '!':
87+ if query_part[0] == '!' or query_part[0] == '?':
8788 prefix = query_part[1:].replace('_', ' ')
8889
8990 # check if prefix is equal with engine shortcut
@@ -110,6 +111,9 @@ class Query(object):
110111 for engine in categories[prefix]
111112 if engine not in self.blocked_engines)
112113
114+ if query_part[0] == '!':
115+ self.specific = True
116+
113117 # append query part to query_part list
114118 self.query_parts.append(query_part)
115119
searx/search.py+1−1
@@ -373,7 +373,7 @@ class Search(object):
373373
374374 # if engines are calculated from query,
375375 # set categories by using that informations
376− if self.engines:
376+ if self.engines and query_obj.specific:
377377 self.categories = list(set(engine['category']
378378 for engine in self.engines))
379379