Mercurial > p > roundup > code
comparison roundup/cgi/templating.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 | b7093aa16895 |
comparison
equal
deleted
inserted
replaced
| 6592:828e2eaee7cd | 6593:e70e2789bc2c |
|---|---|
| 3316 group = self.group | 3316 group = self.group |
| 3317 | 3317 |
| 3318 # get the list of ids we're batching over | 3318 # get the list of ids we're batching over |
| 3319 klass = self.client.db.getclass(self.classname) | 3319 klass = self.client.db.getclass(self.classname) |
| 3320 if self.search_text: | 3320 if self.search_text: |
| 3321 if self.client.db.indexer.query_language: | 3321 indexer = self.client.db.indexer |
| 3322 if indexer.query_language: | |
| 3322 try: | 3323 try: |
| 3323 matches = self.client.db.indexer.search( | 3324 matches = indexer.search( |
| 3324 [self.search_text], klass) | 3325 [self.search_text], klass) |
| 3325 except Exception as e: | 3326 except Exception as e: |
| 3326 self.client.add_error_message(" ".join(e.args)) | 3327 self.client.add_error_message(" ".join(e.args)) |
| 3327 raise | 3328 raise |
| 3328 else: | 3329 else: |
| 3329 matches = self.client.db.indexer.search( | 3330 matches = indexer.search( |
| 3330 [u2s(w.upper()) for w in re.findall( | 3331 [u2s(w.upper()) for w in re.findall( |
| 3331 r'(?u)\b\w{2,25}\b', | 3332 r'(?u)\b\w{%s,%s}\b' % (indexer.minlength, |
| 3333 indexer.maxlength), | |
| 3332 s2u(self.search_text, "replace") | 3334 s2u(self.search_text, "replace") |
| 3333 )], klass) | 3335 )], klass) |
| 3334 else: | 3336 else: |
| 3335 matches = None | 3337 matches = None |
| 3336 | 3338 |