(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index 169af860c885426ffa50f3d5669798c987a03ebc..0a26d0308c6256eefef6ffe503c2e6b2b2aec303 100644 (file)
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -64,7 +64,12 @@ class wsConversionSession {
                                $doc->processOnePage($i);\r
                                $this->processedPages++;\r
                        }\r
-                       $dao->appendDocument($this->bookId, $doc->document_id);\r
+                       try {\r
+                               $dao->appendDocument($this->bookId, $doc->document_id);\r
+                       }\r
+                       catch(Exception $e) {\r
+                               file_put_contents(ROOT . '/test.txt', print_r($e->getTrace(),true));\r
+                       }\r
                        $this->processedDoc++;\r
                }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 863b096414d4e36ab618dfeee48741a21c02c470..7ca436ae9572dd644c4d9432b30f11bec6a80650 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -66,8 +66,6 @@ class wsDAOBook extends extranetDAO {
 \r
        public function sauve($createur, $data)\r
        {\r
-               global $core;\r
-\r
                $c = $this->con->openCursor('books');\r
                $c->nom = $data['nom'];\r
                $c->lang = $data['lang'];\r
@@ -129,15 +127,15 @@ class wsDAOBook extends extranetDAO {
 \r
        public function appendDocument($book_id, $document_id)\r
        {\r
-               $r = $core->con->select('SELECT MAX(book_page) AS book_page FROM books WHERE book_id=\'' . $core->con->escape($book_id) . '\'');\r
-               $lastPage = $r->book_page;\r
+               $r = $this->con->select('SELECT MAX(book_page) AS book_page FROM book_pages WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
+               $lastPage = is_null($r->book_page)?0:$r->book_page;\r
                $this->insertDocument($book_id, $lastPage, $document_id);\r
        }\r
 \r
        public function removePage($book_id, $book_page)\r
        {\r
                // Supprime la page\r
-               $core->con->execute('DELETE FROM book_pages WHERE book_page=\'' . $core->con->escape($book_page) . '\' AND book_id=\'' . $core->con->escape($book_id) . '\'');\r
+               $this->con->execute('DELETE FROM book_pages WHERE book_page=\'' . $this->con->escape($book_page) . '\' AND book_id=\'' . $this->con->escape($book_id) . '\'');\r
                // Décale les pages suivantes vers le haut\r
                $this->decalePages($book_id, $book_page, -1);\r
        }\r
@@ -147,7 +145,7 @@ class wsDAOBook extends extranetDAO {
                // Décale les pages vers le bas\r
                $this->decalePages($book_id, $after_page, 1);\r
                // Insère la page\r
-               $c = $core->con->openCursor('book_pages');\r
+               $c = $this->con->openCursor('book_pages');\r
                $c->book_id = $book_id;\r
                $c->book_page = $after_page + 1;\r
                $c->document_id = $document_id;\r
@@ -158,11 +156,13 @@ class wsDAOBook extends extranetDAO {
        public function insertDocument($book_id, $after_page, $document_id)\r
        {\r
                // Obtiens le nombre de pages\r
-               $r = $core->con->select('SELECT pages FROM documents WHERE document_id=\'' . $core->con->escape($document_id) . '\'');\r
+               $r = $this->con->select('SELECT pages FROM documents WHERE document_id=\'' . $this->con->escape($document_id) . '\'');\r
                // Décale les pages vers le bas\r
-               $this->decalePages($book_id, $after_page, $r->pages);\r
+               if ($after_page > 0) {\r
+                       $this->decalePages($book_id, $after_page, $r->pages);\r
+               }\r
                // Insère les pages\r
-               $c = $core->con->openCursor('book_pages');\r
+               $c = $this->con->openCursor('book_pages');\r
                $c->book_id = $book_id;\r
                $c->document_id = $r->document_id;\r
                for($i = 1;$i <= $r->pages;$i++) {\r
@@ -175,7 +175,7 @@ class wsDAOBook extends extranetDAO {
        protected function decalePages($book_id, $after_page, $decalage)\r
        {\r
                $decalage = ($decalage >= 0)?'+' . $decalage:$decalage;\r
-               $core->con->execute('UPDATE book_pages SET book_page=book_page' . $decalage . ' WHERE book_page>' . $core->con->escape($book_page) . ' AND book_id=\'' . $core->con->escape($book_id) . '\'');\r
+               $this->con->execute('UPDATE book_pages SET book_page=book_page' . $decalage . ' WHERE book_page>' . $this->con->escape($after_page) . ' AND book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
        public function getListe($orderby = null, $sens = null, $limit = null)\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 85a8055abc7da92e3e6002a71e47801ad652fd7a..e68a1315df8fc3a135a156a61d0b5ac819203074 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -53,8 +53,8 @@ class wsDocument extends cubeMetier {
                        mkdir($this->out, 0755, true);\r
                }\r
                $this->log_pointer = fopen($this->log, 'a');\r
-               $this->_memoErrorLog = ini_get('error_log');\r
-               ini_set('error_log', $this->phperrors);\r
+               //$this->_memoErrorLog = ini_get('error_log');\r
+               //ini_set('error_log', $this->phperrors);\r
        }\r
 \r
        public function copyOriginal($tmp_file)\r
@@ -619,7 +619,7 @@ TRACE   drawlink s=http://www.ladocumentationfrancaise.fr/
                if (isset($this->log_pointer) && is_resource($this->log_pointer)) {\r
                        fclose($this->log_pointer);\r
                }\r
-               ini_set('error_log', $this->_memoErrorLog);\r
+               //ini_set('error_log', $this->_memoErrorLog);\r
        }\r
 }\r
 \r