(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 71449467d95916c8a42f12ffeac08b98540c7579..3b020b94d7e3f2fac6fc7d3c6abcdcd6521ca9e6 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -166,7 +166,19 @@ class wsDAOBook extends extranetDAO {
                                $c = unserialize($r->conversion);\r
                                $c = $c->pages[$r->document_page];\r
                        }\r
-                       $pages[$r->book_page] = array('document_id' => $r->document_id, 'document_page' => $r->document_page, 'defaultNum' => $n[$r->document_page-1], 'nb_pages' => $r->doc_pages, 'resolution' => $c->resolution, 'quality' => $c->quality, 'method' => $c->method, 'objects' => $c->objects);\r
+                       if(isset($n[$r->document_page-1])){\r
+                               $num=$n[$r->document_page-1];\r
+                       }else{\r
+                               $num='';\r
+                       }\r
+                       $pages[$r->book_page] = array('document_id' => $r->document_id,\r
+                               'document_page' => $r->document_page,\r
+                               'defaultNum' => $num,\r
+                               'nb_pages' => $r->doc_pages,\r
+                               'resolution' => $c->resolution,\r
+                               'quality' => $c->quality,\r
+                               'method' => $c->method,\r
+                               'objects' => $c->objects);\r
                }\r
                return $pages;\r
        }\r
@@ -493,10 +505,11 @@ class wsDAOBook extends extranetDAO {
                $textes = '';\r
 \r
                $this->makeTextsIndexes($book_id, $index, $textes);\r
+               $daoDoc->getLinksAndRulers($book_id, $links, $rulers);\r
 \r
                $flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
-               $flex->addVariable('links', $book->links, false, true, 'JSONObject');\r
+               $flex->addVariable('links', $links , false, true, 'JSONObject');\r
                $flex->addVariable('signature', $exportSignature, false, true, 'JSONObject');\r
                $flexLight->addVariable('datas', $book->parametres->toStandardObject(), false, true, 'JSONObject');\r
                $flexLight->addVariable('id', $book_id, false, true, 'uint');\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index dece1f35c9103fa9d51e5dd858054ae675075a75..847e8c364d3a10adf16b8f9ba9c2a06162ab20f6 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -24,7 +24,7 @@ class wsDAODocument extends extranetDAO {
 \r
                $booleans = array('video_loop', 'video_auto_start', 'video_controls', 'video_sound_on');\r
 \r
-               $c = $core->con->openCursor('document_links');\r
+               $c = $this->con->openCursor('document_links');\r
                $c->document_id = $document->document_id;\r
                $c->rulers = json_encode(array());\r
                $c->links = json_encode(array());\r