From 93ebab00765e9fbe280eeb2a5f287f67204cc7aa Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 23 Feb 2010 18:22:34 +0000 Subject: [PATCH] --- .../class.ws.conversion.session.php | 7 ++++++- inc/ws/DAO/class.ws.dao.book.php | 20 +++++++++---------- inc/ws/Metier/class.ws.document.php | 6 +++--- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php index 169af860c..0a26d0308 100644 --- 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); $this->processedPages++; } - $dao->appendDocument($this->bookId, $doc->document_id); + try { + $dao->appendDocument($this->bookId, $doc->document_id); + } + catch(Exception $e) { + file_put_contents(ROOT . '/test.txt', print_r($e->getTrace(),true)); + } $this->processedDoc++; } diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php index 863b09641..7ca436ae9 100644 --- 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 { public function sauve($createur, $data) { - global $core; - $c = $this->con->openCursor('books'); $c->nom = $data['nom']; $c->lang = $data['lang']; @@ -129,15 +127,15 @@ class wsDAOBook extends extranetDAO { public function appendDocument($book_id, $document_id) { - $r = $core->con->select('SELECT MAX(book_page) AS book_page FROM books WHERE book_id=\'' . $core->con->escape($book_id) . '\''); - $lastPage = $r->book_page; + $r = $this->con->select('SELECT MAX(book_page) AS book_page FROM book_pages WHERE book_id=\'' . $this->con->escape($book_id) . '\''); + $lastPage = is_null($r->book_page)?0:$r->book_page; $this->insertDocument($book_id, $lastPage, $document_id); } public function removePage($book_id, $book_page) { // Supprime la page - $core->con->execute('DELETE FROM book_pages WHERE book_page=\'' . $core->con->escape($book_page) . '\' AND book_id=\'' . $core->con->escape($book_id) . '\''); + $this->con->execute('DELETE FROM book_pages WHERE book_page=\'' . $this->con->escape($book_page) . '\' AND book_id=\'' . $this->con->escape($book_id) . '\''); // Décale les pages suivantes vers le haut $this->decalePages($book_id, $book_page, -1); } @@ -147,7 +145,7 @@ class wsDAOBook extends extranetDAO { // Décale les pages vers le bas $this->decalePages($book_id, $after_page, 1); // Insère la page - $c = $core->con->openCursor('book_pages'); + $c = $this->con->openCursor('book_pages'); $c->book_id = $book_id; $c->book_page = $after_page + 1; $c->document_id = $document_id; @@ -158,11 +156,13 @@ class wsDAOBook extends extranetDAO { public function insertDocument($book_id, $after_page, $document_id) { // Obtiens le nombre de pages - $r = $core->con->select('SELECT pages FROM documents WHERE document_id=\'' . $core->con->escape($document_id) . '\''); + $r = $this->con->select('SELECT pages FROM documents WHERE document_id=\'' . $this->con->escape($document_id) . '\''); // Décale les pages vers le bas - $this->decalePages($book_id, $after_page, $r->pages); + if ($after_page > 0) { + $this->decalePages($book_id, $after_page, $r->pages); + } // Insère les pages - $c = $core->con->openCursor('book_pages'); + $c = $this->con->openCursor('book_pages'); $c->book_id = $book_id; $c->document_id = $r->document_id; for($i = 1;$i <= $r->pages;$i++) { @@ -175,7 +175,7 @@ class wsDAOBook extends extranetDAO { protected function decalePages($book_id, $after_page, $decalage) { $decalage = ($decalage >= 0)?'+' . $decalage:$decalage; - $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) . '\''); + $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) . '\''); } public function getListe($orderby = null, $sens = null, $limit = null) diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 85a8055ab..e68a1315d 100644 --- 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); } $this->log_pointer = fopen($this->log, 'a'); - $this->_memoErrorLog = ini_get('error_log'); - ini_set('error_log', $this->phperrors); + //$this->_memoErrorLog = ini_get('error_log'); + //ini_set('error_log', $this->phperrors); } public function copyOriginal($tmp_file) @@ -619,7 +619,7 @@ TRACE drawlink s=http://www.ladocumentationfrancaise.fr/ if (isset($this->log_pointer) && is_resource($this->log_pointer)) { fclose($this->log_pointer); } - ini_set('error_log', $this->_memoErrorLog); + //ini_set('error_log', $this->_memoErrorLog); } } -- 2.39.5