veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Return more than just ten results for wildcard lookups. #90

Browse source
This commit is contained in:
Eevee 2010-08-24 20:15:12 -07:00
parent 2431fd6754
commit 6c004737ac
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
pokedex/lookup.py
View file

@ -81,8 +81,9 @@ class LanguageWeighting(whoosh.scoring.Weighting):
class PokedexLookup(object): class PokedexLookup(object):
INTERMEDIATE_LOOKUP_RESULTS = 25 MAX_FUZZY_RESULTS = 10
MAX_LOOKUP_RESULTS = 10 MAX_EXACT_RESULTS = 43
INTERMEDIATE_FACTOR = 2
# The speller only checks how much the input matches a word; there can be # The speller only checks how much the input matches a word; there can be
# all manner of extra unmatched junk, and it won't affect the weighting. # all manner of extra unmatched junk, and it won't affect the weighting.
@ -470,12 +471,26 @@ class PokedexLookup(object):
### Actual searching ### Actual searching
searcher = self.index.searcher() # Limits; result limits are constants, and intermediate results (before
# XXX is this kosher? docs say search() takes a weighting arg, but it # duplicate items are stripped out) are capped at the result limit
# certainly does not # times another constant.
searcher.weighting = LanguageWeighting() # Fuzzy are capped at 10, beyond which something is probably very
results = searcher.search(query, # wrong. Exact matches -- that is, wildcards and ids -- are far less
limit=self.INTERMEDIATE_LOOKUP_RESULTS) # constrained.
# Also, exact matches are sorted by name, since weight doesn't matter.
sort_by = dict()
if exact_only:
max_results = self.MAX_EXACT_RESULTS
sort_by['sortedby'] = (u'table', u'name')
else:
max_results = self.MAX_FUZZY_RESULTS
searcher = self.index.searcher(weighting=LanguageWeighting())
results = searcher.search(
query,
limit=int(max_results * self.INTERMEDIATE_FACTOR),
**sort_by
)
# Look for some fuzzy matches if necessary # Look for some fuzzy matches if necessary
if not exact_only and not results: if not exact_only and not results:
@ -510,12 +525,8 @@ class PokedexLookup(object):
### Convert results to db objects ### Convert results to db objects
objects = self._whoosh_records_to_results(results, exact=exact) objects = self._whoosh_records_to_results(results, exact=exact)
# Only return up to 10 matches; beyond that, something is wrong. We # Truncate and return
# strip out duplicate entries above, so it's remotely possible that we return objects[:max_results]
# should have more than 10 here and lost a few. The speller returns 25
# to give us some padding, and should avoid that problem. Not a big
# deal if we lose the 25th-most-likely match anyway.
return objects[:self.MAX_LOOKUP_RESULTS]
def random_lookup(self, valid_types=[]): def random_lookup(self, valid_types=[]):