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