diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2016-04-12 13:53:31 +0200 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2016-04-12 13:53:31 +0200 |
| commit | 11c2262055235751f7a42fe5053fae375f0efdf6 (patch) | |
| tree | 352befbfc3f1b80e69a3dcd27d79302c4f2d33c2 /searx/search.py | |
| parent | d27f7a1b071b4796e4716951a8e8e62a11dc99c3 (diff) | |
| parent | adb1169fa31b6c504a3f99123d711b3f5c4bf070 (diff) | |
Merge pull request #536 from kvch/general-minor-refactors
General minor refactors
Diffstat (limited to 'searx/search.py')
| -rw-r--r-- | searx/search.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/searx/search.py b/searx/search.py index f38d40106..a40801640 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 @@ -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) @@ -244,7 +243,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 |