X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/007edbf0d879c5aff6a883c64e51955ad1645303..3e0073d9716160a04b18ef2fbb8723d9d42b7a24:/apps/catalogue/models/book.py?ds=inline diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index 13be963d..ade9a429 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -243,13 +243,13 @@ class Book(models.Model): from librarian import NoDublinCore, ParseError, ValidationError try: - bi = BookInfo.from_string(book_xml.encode('utf-8')) + bi = BookInfo.from_string(book_xml.encode('utf-8'), strict=True) except ParseError, e: - raise AssertionError(_('Invalid XML') + ': ' + str(e)) + raise AssertionError(_('Invalid XML') + ': ' + unicode(e)) except NoDublinCore: raise AssertionError(_('No Dublin Core found.')) except ValidationError, e: - raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e)) + raise AssertionError(_('Invalid Dublin Core') + ': ' + unicode(e)) valid_about = self.correct_about() assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about @@ -318,7 +318,7 @@ class Book(models.Model): info = self.book_info() if info is not None: - update['dc_slug'] = info.slug + update['dc_slug'] = info.url.slug Book.objects.filter(pk=self.pk).update(**update) def touch(self): @@ -370,6 +370,15 @@ class Book(models.Model): changes = self.get_current_changes(publishable) return compile_text(change.materialize() for change in changes) + def wldocument(self, publishable=True, changes=None, parse_dublincore=True): + from catalogue.ebook_utils import RedakcjaDocProvider + from librarian.parser import WLDocument + + return WLDocument.from_string( + self.materialize(publishable=publishable, changes=changes), + provider=RedakcjaDocProvider(publishable=publishable), + parse_dublincore=parse_dublincore) + def publish(self, user): """ Publishes a book on behalf of a (local) user.