Merge branch 'master' of github.com:fnp/wolnelektury

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 930f98d..0273e47 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -514,30 +514,23 @@ class Book(models.Model):
         """ (Re)builds the pdf file.
 
         """
-        from librarian import pdf, ParseError
+        from librarian import pdf
         from tempfile import NamedTemporaryFile
         import os
 
+        path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1)
         try:
-            path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1)
-            try:
-                pdf_file = NamedTemporaryFile(delete=False)
-
-                pdf.transform(BookImportDocProvider(self),
-                          file_path=str(self.xml_file.path),
-                          output_file=pdf_file,
-                          )
-
-                self.pdf_file.save('%s.pdf' % self.slug, File(open(pdf_file.name)))
-            finally:
-                unlink(pdf_file.name)
-
-        except ParseError, e:
-            print '%(file)s:%(name)s:%(message)s; use -v to see more output' % {
-                'file': self.xml_file.path,
-                'name': e.__class__.__name__,
-                'message': e
-                }
+            pdf_file = NamedTemporaryFile(delete=False)
+
+            pdf.transform(BookImportDocProvider(self),
+                      file_path=str(self.xml_file.path),
+                      output_file=pdf_file,
+                      )
+
+            self.pdf_file.save('%s.pdf' % self.slug, File(open(pdf_file.name)))
+        finally:
+            unlink(pdf_file.name)
+
 
     def build_epub(self, remove_descendants=True):
         """ (Re)builds the epub file.

diff --git a/scripts/make-tags b/scripts/make-tags
index 1eba155..776d9d9 100755 (executable)
--- a/scripts/make-tags
+++ b/scripts/make-tags
@@ -3,6 +3,7 @@
 ROOT=$(git rev-parse --show-toplevel)
 
 find $ROOT -name '*.py' | xargs etags -o ${ROOT}/TAGS
+find $ROOT/../librarian -name '*.py' | xargs etags -a -o ${ROOT}/TAGS
 if [ -n "$VIRTUAL_ENV" ]; then
   find ${VIRTUAL_ENV}/lib -name '*.py' |xargs etags -a -o ${ROOT}/TAGS
 else