@@ -109,8 +109,20 @@ def render(template_name, **kwargs):
109109def parse_query(query):
110110 query_engines = []
111111 query_parts = query.split()
112− if query_parts[0].startswith('-') and query_parts[0][1:] in engines:
113− query_engines.append({'category': 'TODO', 'name': query_parts[0][1:]})
112+
113+ if query_parts[0].startswith('-'):
114+ engine_name = query_parts[0][1:].replace('_', ' ')
115+ if engine_name in engines:
116+ query_engines.append({'category': 'none',
117+ 'name': query_parts[0][1:]})
118+ elif query_parts[0].startswith('!'):
119+ category_name = query_parts[0][1:].replace('_', ' ')
120+ if category_name in categories:
121+ query_engines.extend({'category': category_name,
122+ 'name': engine.name}
123+ for engine in categories[category_name])
124+
125+ if len(query_engines):
114126 query = query.replace(query_parts[0], '', 1).strip()
115127 return query, query_engines
116128
@@ -130,7 +142,10 @@ def index():
130142
131143 query, selected_engines = parse_query(request_data['q'].encode('utf-8'))
132144
133− if not len(selected_engines):
145+ if len(selected_engines):
146+ selected_categories = list(set(engine['category']
147+ for engine in selected_engines))
148+ else:
134149 for pd_name, pd in request_data.items():
135150 if pd_name.startswith('category_'):
136151 category = pd_name[9:]