(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index e03c2c864ce0d19774a1965119583701b7e0f7aa..6334b94fd12144a78731bb48cce4dbb5920bb810 100644 (file)
--- 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();\r
                        if (!$this->reload) {\r
                                $this->currentDoc->globalOperations();\r
-                               $log=$dao->putLinksFromCSV($this->currentDoc->document_id);\r
-                               $this->currentDoc->addToLog($log);\r
                        } else if ($this->documentsPages[$doc->document_id] == 'all') {\r
                                $this->currentDoc->globalOperations();\r
                        }\r
@@ -139,6 +137,11 @@ class wsConversionSession {
                                // n'est pas en train de recharger le fluidbook\r
                                $daoBook->appendDocument($this->bookId, $this->currentDoc->document_id);\r
                        }\r
+                       \r
+                       if(!$this->reload){\r
+                               $log=$dao->putLinksFromCSV($this->currentDoc->document_id);\r
+                               $this->currentDoc->addToLog($log);\r
+                       }\r
                        $this->processedDoc++;\r
 \r
                        ob_flush();\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 179581e4047299bc9dd79db0e42d854c15e084b0..f2884d9b60e86fcdfe2d115720c7326b1a29ba01 100644 (file)
--- 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 {
 \r
                $c = $this->con->openCursor('document_links_versions');\r
                $c->document_id = $document->document_id;\r
+               $c->update = TIME;\r
 \r
                for ($page = 1; $page <= $document->generalInfos['pages']; $page++) {\r
                        $links[$page] = array();\r
@@ -60,7 +61,7 @@ class wsDAODocument extends commonDAO {
 \r
                        $log[] = 'Links file of page ' . $page . ' found';\r
 \r
-                       $c->update = TIME;\r
+                       \r
                        $fp = fopen($csv, 'rb');\r
 \r
                        while (true) {\r
@@ -96,7 +97,8 @@ class wsDAODocument extends commonDAO {
                }\r
 \r
                $c->links = json_encode($links);\r
-               $c->rulers = '[]';\r
+               $c->comments = 'Links imported from PDF';\r
+               $c->rulers = json_encode(array());\r
                $c->insert();\r
 \r
                return implode("\n", $log);\r