import/load/se.py utils/se.py vendor/xappy/__init__.py vendor/xappy/_checkxapian.py vendor/xappy/datastructures.py vendor/xappy/errors.py vendor/xappy/fieldactions.py vendor/xappy/fieldmappings.py vendor/xappy/highlight.py vendor/xappy/indexerconnection.py vendor/xappy/marshall.py vendor/xappy/memutils.py vendor/xappy/parsedate.py vendor/xappy/replaylog.py vendor/xappy/schema.py vendor/xappy/searchconnection.py @@ -5,3 +5,4 @@ tmp data import/.* .DS_Store +se .gitignore @@ -38,7 +38,7 @@ LOADERS = .schema .manual \ .bills .interests .votesmart .photos .lobbyist \ .fec .census .soi .earmarks .wyr .saveusers .restoreusers -all: database +all: database .se clean: rm $(LOADERS) @@ -48,6 +48,10 @@ cleanload: cleanparse: rm $(NJS) +../se: database + $(PYTHON) load/se.py + touch $@ + database: $(LOADERS) .manual: .schema load/manual.py load/manual/*.json import/Makefile @@ -509,9 +509,7 @@ class Pol_contacts(sql.Table): def init(): db.query("CREATE VIEW census AS select * from census_meta NATURAL JOIN census_data") - db.query("CREATE VIEW v_politician_name AS (SELECT id, firstname, lastname, id || ' ' || firstname || ' ' || lastname AS name FROM politician)") try: db.query("GRANT ALL on census TO watchdog") - db.query("GRANT ALL on v_politician_name TO watchdog") except: pass # user doesn't exist schema.py @@ -9,7 +9,7 @@ $var title: File Not Found <p> <strong>Name or ZIP:</strong> - <input type="text" class="white" name="zip" /> + <input type="text" class="white" name="q" /> <button type="submit" />Search</button> </p> templates/404.html @@ -9,7 +9,7 @@ $var title: The good government site with teeth <p> <strong>Name or ZIP:</strong> - <input type="text" class="white" name="zip" /> + <input type="text" class="white" name="q" /> <button type="submit" />Search</button> </p> templates/index.html @@ -2,7 +2,7 @@ import re, sys import web -from utils import zip2rep, simplegraphs, apipublish, users, writerep +from utils import zip2rep, simplegraphs, apipublish, users, writerep, se import blog import petition import settings @@ -90,21 +90,23 @@ class find: i = web.input(address=None) pzip5 = re.compile(r'\d{5}') pzip4 = re.compile(r'\d{5}-\d{4}') - pname = re.compile(r'[a-zA-Z\.]+') pdist = re.compile(r'[a-zA-Z]{2}\-\d{2}') dists = None - if i.get('zip'): - if pzip4.match(i.zip): - zip, plus4 = i.zip.split('-') + if not i.get('q'): + i.q = i.get('zip') + + if i.q: + if pzip4.match(i.q): + zip, plus4 = i.q.split('-') dists = [x.district for x in db.select('zip4', where='zip=$zip and plus4=$plus4', vars=locals())] - elif pzip5.match(i.zip): + elif pzip5.match(i.q): try: - dists = zip2rep.zip2dist(i.zip, i.address) + dists = zip2rep.zip2dist(i.q, i.address) except zip2rep.BadAddress: - return render.find_badaddr(i.zip, i.address) + return render.find_badaddr(i.q, i.address) if dists: d_dists = schema.District.select(where=web.sqlors('name=', dists)) @@ -114,29 +116,23 @@ class find: if len(dists) == 1: raise web.seeother('/us/%s' % dists[0].lower()) elif len(dists) == 0: - return render.find_none(i.zip) - else: - return render.find_multi(i.zip, d_dists) - - if pdist.match(i.zip): - raise web.seeother('/us/%s' % i.zip) - - if pname.match(i.zip): - in_name = i.zip.lower() - name = in_name.replace(' ', '_') - vars = {'name':'%%%s%%' % name} - reps = db.select('politician', where="id like $name", vars=vars) - if len(reps) == 0: - vars = {'name':'%%%s%%' % in_name} - reps = db.select('v_politician_name', where="name ilike $name", vars=vars) - if len(reps) > 1: - return render.find_multi_reps(reps) + return render.find_none(i.q) else: - try: - rep = reps[0] - web.seeother('/p/%s' % rep.id) - except IndexError: - raise web.notfound + return render.find_multi(i.q, d_dists) + + if pdist.match(i.q): + raise web.seeother('/us/%s' % i.q) + + results = se.query(i.q) + reps = db.select('politician', where=web.sqlors('id=', results)) + if len(reps) > 1: + return render.find_multi_reps(reps) + else: + try: + rep = reps[0] + web.seeother('/p/%s' % rep.id) + except IndexError: + raise web.notfound else: index = schema.District.select(order='name asc') webapp.py 8c756bade59d8146248d4a39bc58ad16cbf34555 Aaron Swartz aaronsw@watchdog.net http://github.com/aaronsw/watchdog/commit/623fed21105bdddd3d7e00b782103cf0fd9a11bc 623fed21105bdddd3d7e00b782103cf0fd9a11bc 2008-11-10T08:25:16-08:00 2008-11-10T08:25:16-08:00 use xapian for search 4e3c8bf55664ae31f8d24df260828d365a481fb3 Aaron Swartz aaronsw@watchdog.net