From ff7fdef651969934b0883aece903f0ae289e55fd Mon Sep 17 00:00:00 2001 From: Marcin Koziej Date: Wed, 18 Jul 2012 01:46:34 +0200 Subject: [PATCH] covers in api --- apps/api/management/commands/mobileinit.py | 14 ++++++++++---- apps/search/views.py | 19 ++++++++++--------- scripts/make-tags | 4 ++-- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/apps/api/management/commands/mobileinit.py b/apps/api/management/commands/mobileinit.py index 2abbfb3d3..91ee3b624 100755 --- a/apps/api/management/commands/mobileinit.py +++ b/apps/api/management/commands/mobileinit.py @@ -71,7 +71,8 @@ def init_db(last_checked): schema = """ CREATE TABLE book ( id INTEGER PRIMARY KEY, - title VARCHAR, + title VARCHAR, + cover VARCHAR, html_file VARCHAR, html_file_size INTEGER, parent INTEGER, @@ -117,9 +118,9 @@ def current(last_checked): book_sql = """ INSERT INTO book - (id, title, html_file, html_file_size, parent, parent_number, sort_key, pretty_size, authors) + (id, title, cover, html_file, html_file_size, parent, parent_number, sort_key, pretty_size, authors) VALUES - (:id, :title, :html_file, :html_file_size, :parent, :parent_number, :sort_key, :size_str, :authors); + (:id, :title, :cover, :html_file, :html_file_size, :parent, :parent_number, :sort_key, :size_str, :authors); """ book_tag_sql = "INSERT INTO book_tag (book, tag) VALUES (:book, :tag);" tag_sql = """ @@ -144,6 +145,10 @@ def add_book(db, book): html_file_size = book.html_file.size else: html_file = html_file_size = None + if book.cover: + cover = book.cover.url + else: + cover = None parent = book.parent_id parent_number = book.parent_number sort_key = book.sort_key @@ -154,7 +159,8 @@ def add_book(db, book): def add_tag(db, tag): id = tag.id - category = categories[tag.category] + # category = categories[tag.category] # localized names here? + category = tag.category name = tag.name sort_key = tag.sort_key diff --git a/apps/search/views.py b/apps/search/views.py index 881815da1..ec8275b91 100644 --- a/apps/search/views.py +++ b/apps/search/views.py @@ -17,10 +17,10 @@ from lucene import StringReader from suggest.forms import PublishingSuggestForm from time import sleep import re -import enchant +#import enchant import json -dictionary = enchant.Dict('pl_PL') +#dictionary = enchant.Dict('en_US') def match_word_re(word): @@ -37,13 +37,14 @@ def did_you_mean(query, tokens): if len(authors) > 0: continue - if not dictionary.check(t): - try: - change_to = dictionary.suggest(t)[0].lower() - if change_to != t.lower(): - change[t] = change_to - except IndexError: - pass + if False: + if not dictionary.check(t): + try: + change_to = dictionary.suggest(t)[0].lower() + if change_to != t.lower(): + change[t] = change_to + except IndexError: + pass if change == {}: return None diff --git a/scripts/make-tags b/scripts/make-tags index 754e63598..c6f81e861 100755 --- a/scripts/make-tags +++ b/scripts/make-tags @@ -9,5 +9,5 @@ else echo "No Virtual env enabled, will not add it to TAGS" fi -find $ROOT/wolnelektury/static/css -name '*.css' |xargs etags -a -o ${ROOT}/TAGS -find $ROOT/wolnelektury/static/js -name '*.js' |xargs etags -a -o ${ROOT}/TAGS +find $ROOT/apps/wolnelektury_core/static/css -name '*.css' |xargs etags -a -o ${ROOT}/TAGS +find $ROOT/apps/wolnelektury_core/static/js -name '*.js' |xargs etags -a -o ${ROOT}/TAGS -- 2.20.1