carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

Make sure the user has actually input some token to search with when doing exact searching (#337)

master
booosy 2022-08-24 01:59:51 -07:00 committed by GitHub
parent f5e61f2d86
commit d2556bc718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/routes/search.py
View File

@ -91,9 +91,9 @@ def searchposts(v):
) )
else: posts = posts.filter(Submission.author_id == author.id) else: posts = posts.filter(Submission.author_id == author.id)
if 'exact' in criteria: if 'exact' in criteria and 'full_text' in criteria:
regex_str = '[[:<:]]'+criteria['full_text']+'[[:>:]]' # https://docs.oracle.com/cd/E17952_01/mysql-5.5-en/regexp.html "word boundaries" regex_str = '[[:<:]]'+criteria['full_text']+'[[:>:]]' # https://docs.oracle.com/cd/E17952_01/mysql-5.5-en/regexp.html "word boundaries"
if('title' in criteria): if 'title' in criteria:
words = [Submission.title.regexp_match(regex_str)] words = [Submission.title.regexp_match(regex_str)]
else: else:
words = [or_(Submission.title.regexp_match(regex_str), Submission.body.regexp_match(regex_str))] words = [or_(Submission.title.regexp_match(regex_str), Submission.body.regexp_match(regex_str))]
@ -210,7 +210,7 @@ def searchcomments(v):
else: comments = comments.filter(Comment.author_id == author.id) else: comments = comments.filter(Comment.author_id == author.id)
if 'exact' in criteria: if 'exact' in criteria and 'full_text' in criteria:
regex_str = '[[:<:]]'+criteria['full_text']+'[[:>:]]' # https://docs.oracle.com/cd/E17952_01/mysql-5.5-en/regexp.html "word boundaries" regex_str = '[[:<:]]'+criteria['full_text']+'[[:>:]]' # https://docs.oracle.com/cd/E17952_01/mysql-5.5-en/regexp.html "word boundaries"
words = [Comment.body.regexp_match(regex_str)] words = [Comment.body.regexp_match(regex_str)]
comments = comments.filter(*words) comments = comments.filter(*words)