X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dd6284e01f00296294a527ded7e840ac14c5fbb8..b93544446c1afb2324e12cef0e670705893797cd:/apps/search/views.py?ds=sidebyside diff --git a/apps/search/views.py b/apps/search/views.py index 75cc16a0d..6dcaf74d3 100644 --- a/apps/search/views.py +++ b/apps/search/views.py @@ -41,13 +41,6 @@ def did_you_mean(query, tokens): return query -def category_name(category): - try: - return filter(lambda c: c[0] == category, TAG_CATEGORIES)[0][1].encode('utf-8') - except IndexError: - raise KeyError("No category %s" % category) - - def hint(request): prefix = request.GET.get('term', '') if len(prefix) < 2: @@ -67,7 +60,6 @@ def hint(request): # jezeli tagi dot tylko ksiazki, to wazne zeby te nowe byly w tej samej ksiazce # jesli zas dotycza themes, to wazne, zeby byly w tym samym fragmencie. - # import pdb; pdb.set_trace() tags = s.hint_tags(prefix) books = s.hint_books(prefix) @@ -76,12 +68,12 @@ def hint(request): return JSONResponse( [{'label': t.name, - 'category': _(category_name(t.category)), + 'category': _(t.category), 'id': t.id, 'url': t.get_absolute_url()} for t in tags] + \ [{'label': b.title, - 'category': _(category_name('book')), + 'category': _('book'), 'id': b.id, 'url': b.get_absolute_url()} for b in books]) @@ -127,7 +119,8 @@ def main(request): context_instance=RequestContext(request)) hint.tags(tag_list) - hint.books(book) + if book: + hint.books(book) toks = StringReader(query) fuzzy = 'fuzzy' in request.GET