Mercurial > p > roundup > code
diff roundup/cgi/actions.py @ 6593:e70e2789bc2c
issue2551189 - increase text search maxlength
This removes I think all the magic references to 25 and 30 (varchar
size) and replaces them with references to maxlength or maxlength+5.
I am not sure why the db column is 5 characters larger than the size
of what should be the max size of a word, but I'll keep the buffer
of 5 as making it 1/5 the size of maxlength makes less sense.
Also added tests for fts search in templating which were missing.
Added postgres, mysql and sqlite native indexing backends in which to
test fts. Added fts test to native-fts as well to make sure it's
working.
I want to commit this now for CI.
Todo:
add test cases for the use of FTS in the csv output in
actions.py. There is no test coverage of the match case there.
change maxlength to a higher value (50) as requested in the ticket.
Modify existing extremewords test cases to allow words > 25 and < 51
write code to migrate column sizes for mysql and postgresql to match
maxlength I will roll this into the version 7 schema update that
supports use of database fts support.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Tue, 25 Jan 2022 13:22:00 -0500 |
| parents | 91ab3e0ffcd0 |
| children | b336cc98d9d2 |
line wrap: on
line diff
--- a/roundup/cgi/actions.py Mon Jan 24 23:23:27 2022 -0500 +++ b/roundup/cgi/actions.py Tue Jan 25 13:22:00 2022 -0500 @@ -1433,9 +1433,10 @@ # full-text search if request.search_text: + indexer = self.db.indexer if self.db.indexer.query_language: try: - matches = self.db.indexer.search( + matches = indexer.search( [request.search_text], klass) except Exception as e: error = " ".join(e.args) @@ -1444,8 +1445,10 @@ # trigger error reporting. NotFound isn't right but... raise exceptions.NotFound(error) else: - matches = self.db.indexer.search( - re.findall(r'\b\w{2,25}\b', request.search_text), klass) + matches = indexer.search( + re.findall(r'\b\w{%s,%s}\b' % (indexer.minlength, + indexer.maxlength), + request.search_text), klass) else: matches = None @@ -1609,9 +1612,10 @@ # full-text search if request.search_text: - if self.db.indexer.query_language: + indexer = self.db.indexer + if indexer.query_language: try: - matches = self.db.indexer.search( + matches = indexer.search( [request.search_text], klass) except Exception as e: error = " ".join(e.args) @@ -1620,8 +1624,10 @@ # trigger error reporting. NotFound isn't right but... raise exceptions.NotFound(error) else: - matches = self.db.indexer.search( - re.findall(r'\b\w{2,25}\b', request.search_text), + matches = indexer.search( + re.findall(r'\b\w{%s,%s}\b' % (indexer.minlength, + indexer.maxlength), + request.search_text), klass) else: matches = None