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

Some minor lookup refactoring.

Browse source 
Wrote a little add() function to clean up the duplication of
add_document().

Delete the index directory if it exists and we're being forced to
recreate it.
This commit is contained in:
Eevee 2009-08-24 21:50:19 -07:00
parent 25577a3397
commit 11989d0db2
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pokedex/lookup.py
View file

@ -3,6 +3,7 @@ from collections import namedtuple
import os, os.path import os, os.path
import pkg_resources import pkg_resources
import re import re
import shutil
from sqlalchemy.sql import func from sqlalchemy.sql import func
import whoosh import whoosh
@ -71,6 +72,14 @@ def open_index(directory=None, session=None, recreate=False):
# Apparently not a real index. Fall out of the if and create it # Apparently not a real index. Fall out of the if and create it
pass pass
# Delete and start over if we're going to bail anyway.
if directory_exists and recreate:
# Be safe and only delete if it looks like a whoosh index, i.e.,
# everything starts with _
if all(f[0] == '_' for f in os.listdir(directory)):
shutil.rmtree(directory)
directory_exists = False
if not directory_exists: if not directory_exists:
os.mkdir(directory) os.mkdir(directory)
@ -104,15 +113,18 @@ def open_index(directory=None, session=None, recreate=False):
row_id=unicode(row.id), row_id=unicode(row.id),
forme_name=u'XXX') forme_name=u'XXX')
def add(name, language, score):
writer.add_document(name=name.lower(), display_name=name,
language=language,
**row_key)
speller_entries.append((name.lower(), score))
# If this is a form, mark it as such # If this is a form, mark it as such
if getattr(row, 'forme_base_pokemon_id', None): if getattr(row, 'forme_base_pokemon_id', None):
row_key['forme_name'] = row.forme_name row_key['forme_name'] = row.forme_name
name = row.name name = row.name
writer.add_document(name=name.lower(), add(name, None, 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', []):
@ -122,21 +134,12 @@ def open_index(directory=None, session=None, recreate=False):
# no point and it makes spell results confusing # no point and it makes spell results confusing
continue continue
writer.add_document(name=moonspeak.lower(), add(moonspeak, foreign_name.language.name, 3)
language=foreign_name.language.name,
display_name=moonspeak,
**row_key)
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) roomaji = romanize(foreign_name.name)
writer.add_document(name=roomaji.lower(), add(roomaji, u'Roomaji', 8)
language='Roomaji',
display_name=roomaji,
**row_key)
speller_entries.append((roomaji.lower(), 8))
writer.commit() writer.commit()