From 8c4db08443c7a55344fa0011b89303467fa62efe Mon Sep 17 00:00:00 2001 From: Noemi Vanyi Date: Sat, 9 Apr 2016 18:26:29 +0200 Subject: rename blocked engines to diabled engines --- searx/search.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'searx/search.py') diff --git a/searx/search.py b/searx/search.py index f38d40106..215774c06 100644 --- a/searx/search.py +++ b/searx/search.py @@ -140,7 +140,7 @@ class Search(object): self.lang = 'all' # set blocked engines - self.blocked_engines = request.preferences.engines.get_disabled() + self.disabled_engines = request.preferences.engines.get_disabled() self.result_container = ResultContainer() self.request_data = {} @@ -167,7 +167,7 @@ class Search(object): # parse query, if tags are set, which change # the serch engine or search-language - query_obj = Query(self.request_data['q'], self.blocked_engines) + query_obj = Query(self.request_data['q'], self.disabled_engines) query_obj.parse_query() # set query @@ -244,7 +244,7 @@ class Search(object): self.engines.extend({'category': categ, 'name': engine.name} for engine in categories[categ] - if (engine.name, categ) not in self.blocked_engines) + if (engine.name, categ) not in self.disabled_engines) # remove suspended engines self.engines = [e for e in self.engines -- cgit v1.2.3 From 5867e979664d655616e09b74b81fb099a2504ba8 Mon Sep 17 00:00:00 2001 From: Noemi Vanyi Date: Sat, 9 Apr 2016 18:32:07 +0200 Subject: more follow ups in new preferences --- searx/search.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'searx/search.py') diff --git a/searx/search.py b/searx/search.py index 215774c06..a40801640 100644 --- a/searx/search.py +++ b/searx/search.py @@ -227,8 +227,7 @@ class Search(object): # using user-defined default-configuration which # (is stored in cookie) if not self.categories: - cookie_categories = request.cookies.get('categories', '') - cookie_categories = cookie_categories.split(',') + cookie_categories = request.preferences.get_value('categories') for ccateg in cookie_categories: if ccateg in categories: self.categories.append(ccateg) -- cgit v1.2.3