From 96c4d52eef7de13f6fa1d6e0ae651c50c3bba515 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 3 Jan 2015 02:31:23 +0100 Subject: [PATCH] Add non exclusif bang Allow to perform a search while adding an engine (or a category) without adding it "officially" to the request. '?' is used to add an engine without modifying anything else to the request. For example, you can perform a search in the 'general' category, and if you add '?tw' the result from Twitter will be added to the originals results. --- searx/query.py | 6 +++++- searx/search.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/searx/query.py b/searx/query.py index 9f711e98..a10a886f 100644 --- a/searx/query.py +++ b/searx/query.py @@ -38,6 +38,7 @@ class Query(object): self.query_parts = [] self.engines = [] self.languages = [] + self.specific = False # parse query, if tags are set, which # change the serch engine or search-language @@ -83,7 +84,7 @@ class Query(object): break # this force a engine or category - if query_part[0] == '!': + if query_part[0] == '!' or query_part[0] == '?': prefix = query_part[1:].replace('_', ' ') # check if prefix is equal with engine shortcut @@ -110,6 +111,9 @@ class Query(object): for engine in categories[prefix] if engine not in self.blocked_engines) + if query_part[0] == '!': + self.specific = True + # append query part to query_part list self.query_parts.append(query_part) diff --git a/searx/search.py b/searx/search.py index fbbf3fe4..1c8b22f9 100644 --- a/searx/search.py +++ b/searx/search.py @@ -371,7 +371,7 @@ class Search(object): # if engines are calculated from query, # set categories by using that informations - if self.engines: + if self.engines and query_obj.specific: self.categories = list(set(engine['category'] for engine in self.engines))