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

Fixes for Whoosh 1.0, and better index recreation.

Browse source
This commit is contained in:
Eevee 2010-09-12 20:51:51 -07:00
parent c05ca1460f
commit 27364e1fbc
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pokedex/lookup.py
View file

@ -69,10 +69,11 @@ class LanguageWeighting(whoosh.scoring.Weighting):
# Apply extra weight # Apply extra weight
weight = weight * self.extra_weights.get(text, 1.0) weight = weight * self.extra_weights.get(text, 1.0)
if doc['language'] == None: language = doc.get('language')
if language is None:
# English (well, "default"); leave it at 1 # English (well, "default"); leave it at 1
return weight return weight
elif doc['language'] == u'Roomaji': elif language == u'Roomaji':
# Give Roomaji a little boost; it's most likely to be searched # Give Roomaji a little boost; it's most likely to be searched
return weight * 0.9 return weight * 0.9
else: else:
@ -175,7 +176,13 @@ class PokedexLookup(object):
display_name=whoosh.fields.STORED, # non-lowercased name display_name=whoosh.fields.STORED, # non-lowercased name
) )
if not os.path.exists(self.directory): if os.path.exists(self.directory):
# create_in() isn't totally reliable, so just nuke whatever's there
# manually. Try to be careful about this...
for f in os.listdir(self.directory):
if re.match('^_?(MAIN|SPELL)_', f):
os.remove(os.path.join(self.directory, f))
else:
os.mkdir(self.directory) os.mkdir(self.directory)
self.index = whoosh.index.create_in(self.directory, schema=schema, self.index = whoosh.index.create_in(self.directory, schema=schema,
@ -382,7 +389,7 @@ class PokedexLookup(object):
results.append(LookupResult(object=obj, results.append(LookupResult(object=obj,
indexed_name=record['name'], indexed_name=record['name'],
name=record['display_name'], name=record['display_name'],
language=record['language'], language=record.get('language'),
iso639=record['iso639'], iso639=record['iso639'],
iso3166=record['iso3166'], iso3166=record['iso3166'],
exact=exact)) exact=exact))