From: Lukasz Anwajler <lukasz@anwajler.com>
Date: Tue, 27 Jul 2010 08:29:02 +0000 (-0500)
Subject: Merge branch 'master' of git@github.com:fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/f8e66ed30238e40a08b6758dbed68cb2e5cf2db9?hp=85ec4a46392eb3cf34cc0300ed48a8eba976cbc6

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 8c83faa53..dd251c16a 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -17,7 +17,7 @@ from newtagging.models import TagBase, tags_updated
 from newtagging import managers
 from catalogue.fields import JSONField
 
-from librarian import dcparser, html, epub
+from librarian import dcparser, html, epub, NoDublinCore
 from mutagen import id3
 
 
@@ -406,9 +406,12 @@ class Book(models.Model):
 
             # Create EPUB
             epub_file = StringIO()
-            epub.transform(book.xml_file, epub_file)
-            book.epub_file.save('%s.epub' % book.slug, ContentFile(epub_file.getvalue()), save=False)
-            FileRecord(slug=book.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save()
+            try:
+                epub.transform(book.xml_file, epub_file)
+                book.epub_file.save('%s.epub' % book.slug, ContentFile(epub_file.getvalue()), save=False)
+                FileRecord(slug=book.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save()
+            except NoDublinCore:
+                pass
 
             # Extract fragments
             closed_fragments, open_fragments = html.extract_fragments(book.html_file.path)
diff --git a/lib/librarian b/lib/librarian
index 4edcff3a9..5b174651e 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit 4edcff3a9e2a4bb2ecb7ab228e5bf37dd28d7e14
+Subproject commit 5b174651e7cadaa9c353cd247fbfcde41b012f3a
diff --git a/wolnelektury/static/css/master.book.css b/wolnelektury/static/css/master.book.css
index 5470dbfac..04b991cdd 100644
--- a/wolnelektury/static/css/master.book.css
+++ b/wolnelektury/static/css/master.book.css
@@ -176,6 +176,9 @@ p {
     font-style: normal;
     font-weight: normal;
     font-size: 12px;
+    padding-left: 2px;
+    position: relative;
+    top: -4px;
 }
 
 #footnotes .annotation {