OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[mod] query parsing refactor vol.1

Browse source
This commit is contained in:
asciimoo 2014-02-09 01:07:18 +01:00
parent 8305da3e5d
commit 7f45e8a562
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
searx/search.py
View file

@ -13,7 +13,6 @@ class Search(object):
self.query = None self.query = None
self.engines = [] self.engines = []
self.categories = [] self.categories = []
query_engines = []
self.paging = False self.paging = False
self.pageno = 1 self.pageno = 1
self.lang = 'all' self.lang = 'all'
@ -46,25 +45,7 @@ class Search(object):
self.pageno = int(pageno_param) self.pageno = int(pageno_param)
query_parts = self.query.split() self.parse_query()
if query_parts[0].startswith('!'):
prefix = query_parts[0][1:].replace('_', ' ')
if prefix in engine_shortcuts\
and not engine_shortcuts[prefix] in self.blocked_engines:
self.engines.append({'category': 'none',
'name': engine_shortcuts[prefix]})
elif prefix in engines\
and not prefix in self.blocked_engines:
self.engines.append({'category': 'none',
'name': prefix})
elif prefix in categories:
self.engines.extend({'category': prefix,
'name': engine.name}
for engine in categories[prefix]
if not engine in self.blocked_engines)
if len(query_engines):
self.query = self.query.replace(query_parts[0], '', 1).strip()
self.categories = [] self.categories = []
@ -92,3 +73,27 @@ class Search(object):
'name': x.name} 'name': x.name}
for x in categories[categ] for x in categories[categ]
if not x.name in self.blocked_engines) if not x.name in self.blocked_engines)
def parse_query(self):
query_parts = self.query.split()
modified = False
if query_parts[0].startswith('!'):
prefix = query_parts[0][1:].replace('_', ' ')
if prefix in engine_shortcuts\
and not engine_shortcuts[prefix] in self.blocked_engines:
modified = True
self.engines.append({'category': 'none',
'name': engine_shortcuts[prefix]})
elif prefix in engines\
and not prefix in self.blocked_engines:
modified = True
self.engines.append({'category': 'none',
'name': prefix})
elif prefix in categories:
modified = True
self.engines.extend({'category': prefix,
'name': engine.name}
for engine in categories[prefix]
if not engine in self.blocked_engines)
if modified:
self.query = self.query.replace(query_parts[0], '', 1).strip()