Mercurial > p > roundup > code
comparison roundup/backends/rdbms_common.py @ 5096:e74c3611b138
- issue2550636, issue2550909: Added support for Whoosh indexer.
Also adds new config.ini setting called indexer to select
indexer. See ``doc/upgrading.txt`` for details. Initial patch
done by David Wolever. Patch modified (see ticket or below for
changes), docs updated and committed.
I have an outstanding issue with test/test_indexer.py. I have to
comment out all imports and tests for indexers I don't have (i.e.
mysql, postgres) otherwise no tests run.
With that change made, dbm, sqlite (rdbms), xapian and whoosh indexes
are all passing the indexer tests.
Changes summary:
1) support native back ends dbm and rdbms. (original patch only fell
through to dbm)
2) Developed whoosh stopfilter to not index stopwords or words outside
the the maxlength and minlength limits defined in index_common.py.
Required to pass the extremewords test_indexer test. Also I
removed a call to .lower on the input text as the tokenizer I chose
automatically does the lowercase.
3) Added support for max/min length to find. This was needed to pass
extremewords test.
4) Added back a call to save_index in add_text. This allowed all but
two tests to pass.
5) Fixed a call to:
results = searcher.search(query.Term("identifier", identifier))
which had an extra parameter that is an error under current whoosh.
6) Set limit=None in search call for find() otherwise it only return
10 items. This allowed it to pass manyresults test
Also due to changes in the roundup code removed the call in
indexer_whoosh to
from roundup.anypy.sets_ import set
since we use the python builtin set.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sat, 25 Jun 2016 20:10:03 -0400 |
| parents | 2b551b6b0830 |
| children | 8901cc4ef0e0 |
comparison
equal
deleted
inserted
replaced
| 5095:d3ba0b254dbb | 5096:e74c3611b138 |
|---|---|
| 62 from roundup.i18n import _ | 62 from roundup.i18n import _ |
| 63 | 63 |
| 64 | 64 |
| 65 # support | 65 # support |
| 66 from roundup.backends.blobfiles import FileStorage | 66 from roundup.backends.blobfiles import FileStorage |
| 67 try: | 67 from roundup.backends.indexer_common import get_indexer |
| 68 from roundup.backends.indexer_xapian import Indexer | |
| 69 except ImportError: | |
| 70 from roundup.backends.indexer_rdbms import Indexer | |
| 71 from roundup.backends.sessions_rdbms import Sessions, OneTimeKeys | 68 from roundup.backends.sessions_rdbms import Sessions, OneTimeKeys |
| 72 from roundup.date import Range | 69 from roundup.date import Range |
| 73 | 70 |
| 74 from roundup.backends.back_anydbm import compile_expression | 71 from roundup.backends.back_anydbm import compile_expression |
| 75 | 72 |
| 170 """ | 167 """ |
| 171 FileStorage.__init__(self, config.UMASK) | 168 FileStorage.__init__(self, config.UMASK) |
| 172 self.config, self.journaltag = config, journaltag | 169 self.config, self.journaltag = config, journaltag |
| 173 self.dir = config.DATABASE | 170 self.dir = config.DATABASE |
| 174 self.classes = {} | 171 self.classes = {} |
| 175 self.indexer = Indexer(self) | 172 self.indexer = get_indexer(config, self) |
| 176 self.security = security.Security(self) | 173 self.security = security.Security(self) |
| 177 | 174 |
| 178 # additional transaction support for external files and the like | 175 # additional transaction support for external files and the like |
| 179 self.transactions = [] | 176 self.transactions = [] |
| 180 | 177 |