From d285fd31ba8f1aaf3539606e98894f4eb396d41c Mon Sep 17 00:00:00 2001 From: Marcin Koziej Date: Wed, 18 Jan 2012 11:49:37 +0100 Subject: [PATCH] bugfixes --- apps/catalogue/utils.py | 18 ++++++++++++------ apps/catalogue/views.py | 2 +- apps/search/views.py | 1 - 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py index a48ec0370..0fdeaf810 100644 --- a/apps/catalogue/utils.py +++ b/apps/catalogue/utils.py @@ -19,6 +19,7 @@ from os import mkdir, path, unlink from errno import EEXIST, ENOENT from fcntl import flock, LOCK_EX from zipfile import ZipFile +from traceback import print_exc from reporting.utils import read_chunks from celery.task import task @@ -144,11 +145,16 @@ def async_build_pdf(book_id, customizations, file_name): Accepts the same args as Book.build_pdf, but with book id as first parameter instead of Book instance """ - book = catalogue.models.Book.objects.get(id=book_id) - print "will gen %s" % DefaultStorage().path(file_name) - if not DefaultStorage().exists(file_name): - book.build_pdf(customizations=customizations, file_name=file_name) - print "done." + try: + book = catalogue.models.Book.objects.get(id=book_id) + print "will gen %s" % DefaultStorage().path(file_name) + if not DefaultStorage().exists(file_name): + book.build_pdf(customizations=customizations, file_name=file_name) + print "done." + except Exception, e: + print "Error during pdf creation: %s" % e + print_exc + raise e class MultiQuerySet(object): @@ -182,4 +188,4 @@ class MultiQuerySet(object): else: offset = 0 stop = total_len - len(items) - continue \ No newline at end of file + continue diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index eb0e7b95a..463b3303b 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -585,7 +585,7 @@ class CustomPDFFormView(AjaxableFormView): request.GET['next'] = "%s?%s" % (reverse('catalogue.views.download_custom_pdf', args=[request.GET['slug']]), request.POST.urlencode()) return super(CustomPDFFormView, self).__call__(request) - + def success(self, *args): pass diff --git a/apps/search/views.py b/apps/search/views.py index d056a1826..710c6dafd 100644 --- a/apps/search/views.py +++ b/apps/search/views.py @@ -31,7 +31,6 @@ def match_word_re(word): def did_you_mean(query, tokens): change = {} for t in tokens: - print("%s ok? %s, sug: %s" % (t, dictionary.check(t), dictionary.suggest(t))) authors = Tag.objects.filter(category='author', name__iregex=match_word_re(t)) if len(authors) > 0: continue -- 2.20.1