Fixes #1598

[redakcja.git] / apps / catalogue / models / book.py

diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index 39f2d0f..4d1b12e 100755 (executable)
--- a/apps/catalogue/models/book.py
+++ b/apps/catalogue/models/book.py
@@ -40,7 +40,8 @@ class Book(models.Model):
     _new_publishable = models.NullBooleanField(editable=False)
     _published = models.NullBooleanField(editable=False)
     _on_track = models.IntegerField(null=True, blank=True, db_index=True, editable=False)
     _new_publishable = models.NullBooleanField(editable=False)
     _published = models.NullBooleanField(editable=False)
     _on_track = models.IntegerField(null=True, blank=True, db_index=True, editable=False)

-    dc_cover_image = models.ForeignKey(Image, blank=True, null=True, db_index=True, on_delete=models.SET_NULL)
+    dc_cover_image = models.ForeignKey(Image, blank=True, null=True,
+        db_index=True, on_delete=models.SET_NULL, editable=False)

     dc_slug = models.CharField(max_length=128, null=True, blank=True,
             editable=False, db_index=True)
 
     dc_slug = models.CharField(max_length=128, null=True, blank=True,
             editable=False, db_index=True)
 


@@ -204,7 +205,8 @@ class Book(models.Model):
         # and move the gallery starts
         if gm.was_merged:
                 for chunk in self[len(self) - len_other:]:
         # and move the gallery starts
         if gm.was_merged:
                 for chunk in self[len(self) - len_other:]:

-                        chunk.gallery_start += gm.dest_size - gm.num_deleted
+                        old_start = chunk.gallery_start or 1
+                        chunk.gallery_start = old_start + gm.dest_size - gm.num_deleted

                         chunk.save()
 
         other.delete()
                         chunk.save()
 
         other.delete()


@@ -254,13 +256,11 @@ class Book(models.Model):
             changes = self.get_current_changes(publishable=True)
         except self.NoTextError:
             raise AssertionError(_('Not all chunks have publishable revisions.'))
             changes = self.get_current_changes(publishable=True)
         except self.NoTextError:
             raise AssertionError(_('Not all chunks have publishable revisions.'))

-        book_xml = self.materialize(changes=changes)

 
 

-        from librarian.dcparser import BookInfo

         from librarian import NoDublinCore, ParseError, ValidationError
 
         try:
         from librarian import NoDublinCore, ParseError, ValidationError
 
         try:

-            bi = BookInfo.from_string(book_xml.encode('utf-8'), strict=True)
+            bi = self.wldocument(changes=changes, strict=True).book_info

         except ParseError, e:
             raise AssertionError(_('Invalid XML') + ': ' + unicode(e))
         except NoDublinCore:
         except ParseError, e:
             raise AssertionError(_('Invalid XML') + ': ' + unicode(e))
         except NoDublinCore:


@@ -271,6 +271,14 @@ class Book(models.Model):
         valid_about = self.correct_about()
         assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about
 
         valid_about = self.correct_about()
         assert bi.about == valid_about, _("rdf:about is not") + " " + valid_about
 

+    def publishable_error(self):
+        try:
+            return self.assert_publishable()
+        except AssertionError, e:
+            return e
+        else:
+            return None
+

     def hidden(self):
         return self.slug.startswith('.')
 
     def hidden(self):
         return self.slug.startswith('.')
 


@@ -343,7 +351,7 @@ class Book(models.Model):
                 except:
                     pass
                 else:
                 except:
                     pass
                 else:

-                    if info.cover_source == image.get_absolute_url():
+                    if info.cover_source == image.get_full_url():

                         update['dc_cover_image'] = image
         Book.objects.filter(pk=self.pk).update(**update)
 
                         update['dc_cover_image'] = image
         Book.objects.filter(pk=self.pk).update(**update)
 


@@ -396,14 +404,16 @@ class Book(models.Model):
             changes = self.get_current_changes(publishable)
         return compile_text(change.materialize() for change in changes)
 
             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):
+    def wldocument(self, publishable=True, changes=None, 
+            parse_dublincore=True, strict=False):

         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),
         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)
+                parse_dublincore=parse_dublincore,
+                strict=strict)

 
     def publish(self, user):
         """
 
     def publish(self, user):
         """