From: Jan Szejko Date: Wed, 6 Apr 2016 11:53:26 +0000 (+0200) Subject: fix in publishing X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/cd40895f8cdb7ffe69612de434dfb85bcd391d89 fix in publishing --- diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py index 5b49307a3..b1242e7e1 100644 --- a/src/catalogue/fields.py +++ b/src/catalogue/fields.py @@ -153,7 +153,7 @@ class BuildHtml(BuildEbook): book = fieldfile.instance - html_output = self.transform(book.wldocument(), fieldfile) + html_output = self.transform(book.wldocument(parse_dublincore=False), fieldfile) # Delete old fragments, create from scratch if necessary. book.fragments.all().delete() @@ -219,7 +219,14 @@ class BuildHtml(BuildEbook): @staticmethod def transform(wldoc, fieldfile): - return wldoc.as_html(options={'gallery': "'%s'" % gallery_url(wldoc.book_info.url.slug)}) + # ugly, but we can't use wldoc.book_info here + from librarian import DCNS + url_elem = wldoc.edoc.getroot().find('.//' + DCNS('identifier.url')) + if url_elem is None: + gallery = '' + else: + gallery = gallery_url(slug=url_elem.text.rsplit('/', 1)[1]) + return wldoc.as_html(options={'gallery': "'%s'" % gallery}) @BuildEbook.register('cover_thumb')