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 correctly-cased foreign names from lookup. #15

Browse source
This commit is contained in:
Eevee 2009-08-22 20:49:07 -07:00
parent a9a88ec3e4
commit a7c0830e48
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pokedex/lookup.py
View file

@ -81,6 +81,7 @@ def open_index(directory=None, session=None, recreate=False):
table=whoosh.fields.STORED, table=whoosh.fields.STORED,
row_id=whoosh.fields.ID(stored=True), row_id=whoosh.fields.ID(stored=True),
language=whoosh.fields.STORED, language=whoosh.fields.STORED,
display_name=whoosh.fields.STORED, # non-lowercased name
) )
index = whoosh.index.create_in(directory, schema=schema, indexname='MAIN') index = whoosh.index.create_in(directory, schema=schema, indexname='MAIN')
@ -102,29 +103,34 @@ def open_index(directory=None, session=None, recreate=False):
for row in q.yield_per(5): for row in q.yield_per(5):
row_key = dict(table=cls.__tablename__, row_id=unicode(row.id)) row_key = dict(table=cls.__tablename__, row_id=unicode(row.id))
name = row.name.lower() name = row.name
writer.add_document(name=name, **row_key) writer.add_document(name=name.lower(),
speller_entries.append((name, 1)) display_name=name,
**row_key)
speller_entries.append((name.lower(), 1))
# Pokemon also get other languages # Pokemon also get other languages
for foreign_name in getattr(row, 'foreign_names', []): for foreign_name in getattr(row, 'foreign_names', []):
moonspeak = foreign_name.name.lower() moonspeak = foreign_name.name
if name == moonspeak: if name == moonspeak:
# Don't add the English name again as a different language; # Don't add the English name again as a different language;
# no point and it makes spell results confusing # no point and it makes spell results confusing
continue continue
writer.add_document(name=moonspeak, writer.add_document(name=moonspeak.lower(),
language=foreign_name.language.name, language=foreign_name.language.name,
display_name=moonspeak,
**row_key) **row_key)
speller_entries.append((moonspeak, 3)) speller_entries.append((moonspeak.lower(), 3))
# Add Roomaji too # Add Roomaji too
if foreign_name.language.name == 'Japanese': if foreign_name.language.name == 'Japanese':
roomaji = romanize(foreign_name.name).lower() roomaji = romanize(foreign_name.name)
writer.add_document(name=roomaji, language='Roomaji', writer.add_document(name=roomaji.lower(),
language='Roomaji',
display_name=roomaji,
**row_key) **row_key)
speller_entries.append((roomaji, 8)) speller_entries.append((roomaji.lower(), 8))
writer.commit() writer.commit()
@ -248,7 +254,7 @@ def lookup(input, session=None, indices=None, exact_only=False):
cls = indexed_tables[result['table']] cls = indexed_tables[result['table']]
obj = session.query(cls).get(result['row_id']) obj = session.query(cls).get(result['row_id'])
objects.append(LookupResult(object=obj, objects.append(LookupResult(object=obj,
name=result['name'], name=result['display_name'],
language=result['language'], language=result['language'],
exact=exact)) exact=exact))