From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 11 Aug 2011 08:35:43 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ec0532438447bf96aef1be0a0df8a6a382c63314;p=cubeextranet.git

---

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 3d4e90ae9..1c31d034c 100644
--- 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);
 		$db->book_pages_versions->composition('text', 0, false);
 		// Clés
-		$db->book_pages_versions->primary('pk_book_pages_versions', 'book_id');
+		$db->book_pages_versions->primary('pk_book_pages_versions', 'book_id', 'update');
 		$db->book_pages_versions->index('idx_book_pages_versions', 'BTREE', 'update');
 		// Table de cache des urls courtes
 		$db->book_short_url->long_url('varchar', 255, false);
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index b936bd3c3..fe93ec2d6 100644
--- 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);
 		}
 		$c->insert();
+		$this->saveCompositionVersion($book_id);
 
 		return $this->selectById($book_id);
 	}
@@ -295,8 +296,10 @@ class wsDAOBook extends commonDAO {
 		// Mets à jour la numerotation de la publication
 		$c = $this->con->openCursor('books');
 		$c->numerotation = implode(',', $num);
-		$c->composition_update=TIME;
+		$c->composition_update = TIME;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
+
+		$this->saveCompositionVersion($book_id);
 	}
 
 	protected function decalePages($book_id, $after_page, $decalage) {
@@ -412,6 +415,16 @@ class wsDAOBook extends commonDAO {
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 	}
 
+	public function saveCompositionVersion($book_id) {
+		$pages = $this->getPagesOfBook($book_id);
+
+		$c = $this->con->openCursor('book_pages_versions');
+		$c->update = TIME;
+		$c->book_id = $book_id;
+		$c->composition = serialize($pages);
+		$c->insert();
+	}
+
 	public function setLang($book_id, $base, $traductions) {
 		// Cleanup user translations
 		$traductions = json_decode($traductions, true);
@@ -536,6 +549,7 @@ class wsDAOBook extends commonDAO {
 				$i++;
 			}
 			$c->composition_update = TIME;
+			$this->saveCompositionVersion($book_id);
 		}
 
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');