(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 3d4e90ae92e2b8e85758f30255c924d43d0b5141..1c31d034c9a802a533d1dff6729d507e1fbcefd2 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -398,7 +398,7 @@ class commonCore extends cubeCore {
                $db->book_pages_versions->update('integer', 0, false);\r
                $db->book_pages_versions->composition('text', 0, false);\r
                // Clés\r
-               $db->book_pages_versions->primary('pk_book_pages_versions', 'book_id');\r
+               $db->book_pages_versions->primary('pk_book_pages_versions', 'book_id', 'update');\r
                $db->book_pages_versions->index('idx_book_pages_versions', 'BTREE', 'update');\r
                // Table de cache des urls courtes\r
                $db->book_short_url->long_url('varchar', 255, false);\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index b936bd3c3a73f3b4f48c09bab1d58920160d2d77..fe93ec2d606039b9507bca9853223e30bc1910fa 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -155,6 +155,7 @@ class wsDAOBook extends commonDAO {
                        $this->con->execute('INSERT INTO book_pages SELECT ' . $book_id . ' AS book_id,book_page,document_id,document_page FROM book_pages WHERE book_id=' . $old_id);\r
                }\r
                $c->insert();\r
+               $this->saveCompositionVersion($book_id);\r
 \r
                return $this->selectById($book_id);\r
        }\r
@@ -295,8 +296,10 @@ class wsDAOBook extends commonDAO {
                // Mets à jour la numerotation de la publication\r
                $c = $this->con->openCursor('books');\r
                $c->numerotation = implode(',', $num);\r
-               $c->composition_update=TIME;\r
+               $c->composition_update = TIME;\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
+\r
+               $this->saveCompositionVersion($book_id);\r
        }\r
 \r
        protected function decalePages($book_id, $after_page, $decalage) {\r
@@ -412,6 +415,16 @@ class wsDAOBook extends commonDAO {
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
+       public function saveCompositionVersion($book_id) {\r
+               $pages = $this->getPagesOfBook($book_id);\r
+\r
+               $c = $this->con->openCursor('book_pages_versions');\r
+               $c->update = TIME;\r
+               $c->book_id = $book_id;\r
+               $c->composition = serialize($pages);\r
+               $c->insert();\r
+       }\r
+\r
        public function setLang($book_id, $base, $traductions) {\r
                // Cleanup user translations\r
                $traductions = json_decode($traductions, true);\r
@@ -536,6 +549,7 @@ class wsDAOBook extends commonDAO {
                                $i++;\r
                        }\r
                        $c->composition_update = TIME;\r
+                       $this->saveCompositionVersion($book_id);\r
                }\r
 \r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r