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

Removed forme_name from lookup; added indexed_name to results.

Browse source
This commit is contained in:
Eevee 2010-03-23 18:09:03 -07:00
parent add2111205
commit 10ebe04999
1 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pokedex/lookup.py
View file

@ -26,7 +26,7 @@ __all__ = ['PokedexLookup']
rx_is_number = re.compile('^\d+$') rx_is_number = re.compile('^\d+$')
LookupResult = namedtuple('LookupResult', LookupResult = namedtuple('LookupResult',
['object', 'name', 'language', 'iso3166', 'exact']) ['object', 'indexed_name', 'name', 'language', 'iso3166', 'exact'])
class LanguageWeighting(whoosh.scoring.Weighting): class LanguageWeighting(whoosh.scoring.Weighting):
"""A scoring class that forces otherwise-equal English results to come """A scoring class that forces otherwise-equal English results to come
@ -129,7 +129,6 @@ class PokedexLookup(object):
language=whoosh.fields.STORED, language=whoosh.fields.STORED,
iso3166=whoosh.fields.STORED, iso3166=whoosh.fields.STORED,
display_name=whoosh.fields.STORED, # non-lowercased name display_name=whoosh.fields.STORED, # non-lowercased name
forme_name=whoosh.fields.ID,
) )
self.index = whoosh.index.create_in(directory, schema=schema, self.index = whoosh.index.create_in(directory, schema=schema,
@ -146,28 +145,12 @@ class PokedexLookup(object):
q = session.query(cls) q = session.query(cls)
for row in q.yield_per(5): for row in q.yield_per(5):
# Need to give forme_name a dummy value because I can't row_key = dict(table=unicode(cls.__tablename__),
# search for explicitly empty fields. Boo. row_id=unicode(row.id))
row_keys = [
dict(table=unicode(cls.__tablename__),
row_id=unicode(row.id),
forme_name=u'__empty__')
]
# If this is a form, mark it as such
# XXX foreign form names...?
if getattr(row, 'forme_name', None):
# ...but if it's also the *default* form, index the name
# bare too
if not getattr(row, 'forme_base_pokemon_id', None):
new_key = row_keys[0].copy()
row_keys.append(new_key)
row_keys[0]['forme_name'] = row.forme_name
def add(name, language, iso3166, score): def add(name, language, iso3166, score):
normalized_name = self.normalize_name(name) normalized_name = self.normalize_name(name)
for row_key in row_keys:
writer.add_document( writer.add_document(
name=normalized_name, display_name=name, name=normalized_name, display_name=name,
language=language, iso3166=iso3166, language=language, iso3166=iso3166,
@ -177,13 +160,24 @@ class PokedexLookup(object):
speller_entries.append((normalized_name, score)) speller_entries.append((normalized_name, score))
name = row.name # Add the basic English name to the index
add(name, None, u'us', 1) if cls == tables.Pokemon:
# Pokémon need their form name added
# XXX kinda kludgy
add(row.full_name, None, u'us', 1)
# Pokemon also get other languages # If this is a default form, ALSO add the unadorned name,
# so 'Deoxys' alone will still do the right thing
if row.forme_name and not row.forme_base_pokemon_id:
add(row.name, None, u'us', 1)
else:
add(row.name, None, u'us', 1)
# Some things also have other languages' names
# XXX other language form names..?
for foreign_name in getattr(row, 'foreign_names', []): for foreign_name in getattr(row, 'foreign_names', []):
moonspeak = foreign_name.name moonspeak = foreign_name.name
if name == moonspeak: if row.name == moonspeak:
# Don't add the English name again as a different # Don't add the English name again as a different
# language; no point and it makes spell results # language; no point and it makes spell results
# confusing # confusing
@ -265,6 +259,7 @@ class PokedexLookup(object):
obj = self.session.query(cls).get(record['row_id']) obj = self.session.query(cls).get(record['row_id'])
results.append(LookupResult(object=obj, results.append(LookupResult(object=obj,
indexed_name=record['name'],
name=record['display_name'], name=record['display_name'],
language=record['language'], language=record['language'],
iso3166=record['iso3166'], iso3166=record['iso3166'],