Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-23 16:59:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove deuplication. Add comment about regex.

Browse Source
This commit is contained in:
Erik Johnston 2015-12-02 13:09:37 +00:00
parent 477da77b46
commit 7dd6e5efca
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
synapse/storage/search.py
View File

@ -140,10 +140,7 @@ class SearchStore(BackgroundUpdateStore):
list of dicts list of dicts
""" """
clauses = [] clauses = []
if isinstance(self.database_engine, PostgresEngine): args = [_parse_query(self.database_engine, search_term)]
args = [_postgres_parse_query(search_term)]
else:
args = [_sqlite_parse_query(search_term)]
# Make sure we don't explode because the person is in too many rooms. # Make sure we don't explode because the person is in too many rooms.
# We filter the results below regardless. # We filter the results below regardless.
@ -230,10 +227,7 @@ class SearchStore(BackgroundUpdateStore):
""" """
clauses = [] clauses = []
if isinstance(self.database_engine, PostgresEngine): args = [_parse_query(self.database_engine, search_term)]
args = [_postgres_parse_query(search_term)]
else:
args = [_sqlite_parse_query(search_term)]
# Make sure we don't explode because the person is in too many rooms. # Make sure we don't explode because the person is in too many rooms.
# We filter the results below regardless. # We filter the results below regardless.
@ -408,21 +402,17 @@ def _to_postgres_options(options_dict):
) )
def _postgres_parse_query(search_term): def _parse_query(database_engine, search_term):
"""Takes a plain unicode string from the user and converts it into a form """Takes a plain unicode string from the user and converts it into a form
that can be passed to `to_tsquery(..)` postgres func. We use this so that that can be passed to database.
we can add prefix matching, which isn't something `plainto_tsquery` supports. We use this so that we can add prefix matching, which isn't something
that is supported by default.
""" """
# Pull out the individual words, discarding any non-word characters.
results = re.findall(r"([\w\-]+)", search_term, re.UNICODE) results = re.findall(r"([\w\-]+)", search_term, re.UNICODE)
if isinstance(database_engine, PostgresEngine):
return " & ".join(result + ":*" for result in results) return " & ".join(result + ":*" for result in results)
else:
def _sqlite_parse_query(search_term):
"""Takes a plain unicode string from the user and converts it into a form
that can be passed to sqlite `MATCH`. We use this so that we can do prefix
matching.
"""
results = re.findall(r"([\w\-]+)", search_term, re.UNICODE)
return " & ".join(result + "*" for result in results) return " & ".join(result + "*" for result in results)