Skip to content

Commit

Permalink
Fix issues with object preselection in main view, object lookup in "SEO"
Browse files Browse the repository at this point in the history
view.  Don't minify files in development.
  • Loading branch information
Ian committed Sep 21, 2013
1 parent d20c581 commit 782053e
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 507 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -6,10 +6,10 @@
*.rdb

venv

build
pip-log.txt
nohup.out
.DS_Store
local_config.py

data/deltav/db2.csv
8 changes: 4 additions & 4 deletions api.py
Expand Up @@ -66,14 +66,14 @@ def rankings(sort_by, limit, orbits_only=False):
return ret

def autocomplete(query, limit):
query = query.replace('+', ' ')
query = query.replace('+', ' ').lower()
regx = re.compile(query, re.IGNORECASE)
ret = list(asteroids.find({'full_name': {'$regex': regx}}, \
{'_id': False})
.limit(limit))
{'_id': False}))
#.limit(limit))
# this sorting is not quite exact, as it penalizes asteroids with
# long prefix numbers. But it's close enough.
return sorted(ret, key=lambda x: x['full_name'].find(query))
return sorted(ret, key=lambda x: x['full_name'].lower().find(query))[:limit]

def compositions():
return horizon.compositions()
Expand Down
9 changes: 8 additions & 1 deletion app.py
Expand Up @@ -18,6 +18,12 @@
mail = Mail(app)
app.secret_key = 'not a secret key'

try:
import local_config
app.config['ASSETS_DEBUG'] = local_config.DEBUG
except ImportError:
pass

# bundling
assets = Environment(app)
# This filter can be helping for debugging javascript.
Expand Down Expand Up @@ -59,7 +65,8 @@ def asteroid_details(asteroid_slug=None):
if not asteroid_slug:
return 'Sorry, could not find this asteroid in our database.', 404
unslug = asteroid_slug.replace('-', ' ')
candidates = api.autocomplete(unslug, 1) # TODO better way
# Need to get top 10, otherwise sometimes the best match is not returned by mongo.
candidates = api.autocomplete(unslug, 10) # TODO better way?
if len(candidates) < 1:
return 'Sorry, could not find this asteroid in our database.', 404

Expand Down
1 change: 1 addition & 0 deletions local_config_example.py
@@ -0,0 +1 @@
DEBUG = True
59 changes: 0 additions & 59 deletions static/js/main/controllers/Asterank3D.js

This file was deleted.

191 changes: 0 additions & 191 deletions static/js/main/controllers/AsteroidDetails.js

This file was deleted.

29 changes: 0 additions & 29 deletions static/js/main/controllers/AsteroidLookup.js

This file was deleted.

0 comments on commit 782053e

Please sign in to comment.