Browse Source

[enh] allow override of blocked engines from query string

Adam Tauber 10 years ago
parent
commit
78828efdb0
1 changed files with 4 additions and 6 deletions
  1. 4
    6
      searx/query.py

+ 4
- 6
searx/query.py View File

@@ -88,18 +88,16 @@ class Query(object):
88 88
                 prefix = query_part[1:].replace('_', ' ')
89 89
 
90 90
                 # check if prefix is equal with engine shortcut
91
-                if prefix in engine_shortcuts\
92
-                   and not engine_shortcuts[prefix] in self.blocked_engines:
91
+                if prefix in engine_shortcuts:
93 92
                     parse_next = True
94 93
                     self.engines.append({'category': 'none',
95 94
                                          'name': engine_shortcuts[prefix]})
96 95
 
97 96
                 # check if prefix is equal with engine name
98
-                elif prefix in engines\
99
-                        and prefix not in self.blocked_engines:
97
+                elif prefix in engines:
100 98
                     parse_next = True
101 99
                     self.engines.append({'category': 'none',
102
-                                        'name': prefix})
100
+                                         'name': prefix})
103 101
 
104 102
                 # check if prefix is equal with categorie name
105 103
                 elif prefix in categories:
@@ -107,7 +105,7 @@ class Query(object):
107 105
                     # are declared under that categorie name
108 106
                     parse_next = True
109 107
                     self.engines.extend({'category': prefix,
110
-                                        'name': engine.name}
108
+                                         'name': engine.name}
111 109
                                         for engine in categories[prefix]
112 110
                                         if engine not in self.blocked_engines)
113 111