From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 7 Jan 2011 09:10:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1351aaf1096c77210dc8af46c15d18b5e8bac475;p=cubeextranet.git

---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 71449467d..3b020b94d 100644
--- 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);
 				$c = $c->pages[$r->document_page];
 			}
-			$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);
+			if(isset($n[$r->document_page-1])){
+				$num=$n[$r->document_page-1];
+			}else{
+				$num='';
+			}
+			$pages[$r->book_page] = array('document_id' => $r->document_id,
+				'document_page' => $r->document_page,
+				'defaultNum' => $num,
+				'nb_pages' => $r->doc_pages,
+				'resolution' => $c->resolution,
+				'quality' => $c->quality,
+				'method' => $c->method,
+				'objects' => $c->objects);
 		}
 		return $pages;
 	}
@@ -493,10 +505,11 @@ class wsDAOBook extends extranetDAO {
 		$textes = '';
 
 		$this->makeTextsIndexes($book_id, $index, $textes);
+		$daoDoc->getLinksAndRulers($book_id, $links, $rulers);
 
 		$flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);
 		$flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);
-		$flex->addVariable('links', $book->links, false, true, 'JSONObject');
+		$flex->addVariable('links', $links , false, true, 'JSONObject');
 		$flex->addVariable('signature', $exportSignature, false, true, 'JSONObject');
 		$flexLight->addVariable('datas', $book->parametres->toStandardObject(), false, true, 'JSONObject');
 		$flexLight->addVariable('id', $book_id, false, true, 'uint');
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index dece1f35c..847e8c364 100644
--- 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 {
 
 		$booleans = array('video_loop', 'video_auto_start', 'video_controls', 'video_sound_on');
 
-		$c = $core->con->openCursor('document_links');
+		$c = $this->con->openCursor('document_links');
 		$c->document_id = $document->document_id;
 		$c->rulers = json_encode(array());
 		$c->links = json_encode(array());