From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 25 May 2011 14:53:35 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=fdd10b2e6060af439a6b4656767550b497e8dc75;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index e03c2c864..6334b94fd 100644
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -89,8 +89,6 @@ class wsConversionSession {
 			$this->serialize();
 			if (!$this->reload) {
 				$this->currentDoc->globalOperations();
-				$log=$dao->putLinksFromCSV($this->currentDoc->document_id);
-				$this->currentDoc->addToLog($log);
 			} else if ($this->documentsPages[$doc->document_id] == 'all') {
 				$this->currentDoc->globalOperations();
 			}
@@ -139,6 +137,11 @@ class wsConversionSession {
 				// n'est pas en train de recharger le fluidbook
 				$daoBook->appendDocument($this->bookId, $this->currentDoc->document_id);
 			}
+			
+			if(!$this->reload){
+				$log=$dao->putLinksFromCSV($this->currentDoc->document_id);
+				$this->currentDoc->addToLog($log);
+			}
 			$this->processedDoc++;
 
 			ob_flush();
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 179581e40..f2884d9b6 100644
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -48,6 +48,7 @@ class wsDAODocument extends commonDAO {
 
 		$c = $this->con->openCursor('document_links_versions');
 		$c->document_id = $document->document_id;
+		$c->update = TIME;
 
 		for ($page = 1; $page <= $document->generalInfos['pages']; $page++) {
 			$links[$page] = array();
@@ -60,7 +61,7 @@ class wsDAODocument extends commonDAO {
 
 			$log[] = 'Links file of page ' . $page . ' found';
 
-			$c->update = TIME;
+			
 			$fp = fopen($csv, 'rb');
 
 			while (true) {
@@ -96,7 +97,8 @@ class wsDAODocument extends commonDAO {
 		}
 
 		$c->links = json_encode($links);
-		$c->rulers = '[]';
+		$c->comments = 'Links imported from PDF';
+		$c->rulers = json_encode(array());
 		$c->insert();
 
 		return implode("\n", $log);