wassname/flask-whooshee
1
0
Fork 0
mirror of https://github.com/wassname/flask-whooshee.git synced 2026-09-11 12:11:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add some more options to search method

Browse Source
This commit is contained in:
Bohuslav Kabrda
2013-02-14 11:49:01 +01:00
parent 35bf11a2a0
commit 99b15051de
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_whooshee.py
+7 -6
View File
@@ -13,10 +13,10 @@ class AbstractWhoosheer(object):
__metaclass__ = abc.ABCMeta
@classmethod
def search(cls, search_string, values_of=''):
prepped_string = cls.prep_search_string(search_string)
def search(cls, search_string, values_of='', group=whoosh.qparser.OrGroup, match_substrings=True):
prepped_string = cls.prep_search_string(search_string, match_substrings)
with cls.index.searcher() as searcher:
parser = whoosh.qparser.MultifieldParser(cls.schema.names(), cls.index.schema)
parser = whoosh.qparser.MultifieldParser(cls.schema.names(), cls.index.schema, group=group)
query = parser.parse(prepped_string)
results = searcher.search(query)
if values_of:
@@ -24,14 +24,15 @@ class AbstractWhoosheer(object):
return results
@classmethod
def prep_search_string(cls, search_string):
def prep_search_string(cls, search_string, match_substrings):
s = search_string.strip()
# we don't want stars from user
s = s.replace('*', '')
if len(s) < cls.search_string_min_len:
raise ValueError('Search string must have at least 3 characters')
# replace multiple whitechars with one space
s = u'*{0}*'.format(re.sub('[\s]+', '*', s))
# replace multiple with star space star
if match_substrings:
s = u'*{0}*'.format(re.sub('[\s]+', '* *', s))
# TODO: some sanitization
return s