(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a4dac86f916fe4675f682c43d0d2c6eee1fae033..43022f433ca36b0a9929f3cb3cc1add92a244866 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -233,7 +233,7 @@ html{height:100%}' . "\n";
                $dao = new wsDAOBook($core->con);\r
                header('Content-type: text/plain');\r
                ob_clean();\r
-               echo $dao->compile(2964, 3, false);\r
+               echo $dao->compile(2970, 3, false);\r
                exit;\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 94d57be40dea8ecd5167fb121143146a913b7661..0afe5c99c72516fa8e76316a4f7799ef3a3a73ce 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -462,9 +462,14 @@ class wsDAOBook extends extranetDAO {
                $twords = explode("\n", trim($ipage));\r
 \r
                foreach($twords as $woadata) {\r
+\r
                        list($woa, $worddata) = explode(',', trim($woadata));\r
                        list($total, $wordslist) = explode("\t", $worddata, 2);\r
 \r
+                       if($woa==''){\r
+                               continue;\r
+                       }\r
+\r
                        if (!isset($index[$woa])) {\r
                                $index[$woa] = array('total' => 0, 'words' => array());\r
                        }\r
@@ -508,7 +513,7 @@ class wsDAOBook extends extranetDAO {
         */\r
        public function compile3($book_id, $complete)\r
        {\r
-               set_time_limit(0);\r
+               //cubePHP::neverStop();\r
 \r
                $filesToCopy = array();\r
                $finalDir = WS_BOOKS . '/final/' . $book_id . '/';\r
@@ -541,22 +546,22 @@ class wsDAOBook extends extranetDAO {
 \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);\r
-               $flex->addVariable('signature', $exportSignature);\r
-               $flexLight->addVariable('datas', $book->parametres->toStandardObject());\r
+               $flex->addVariable('links', $book->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
 \r
-               $flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions));\r
-               $flex->addVariable('chapters', $book->chapters);\r
+               $flex->addVariable('traductions', wsLang::getTraductionWithId($book->traductions),false,true,'JSONObject');\r
+               $flex->addVariable('chapters', $book->chapters,false,true,'JSONObject');\r
                $flex->addVariable('extras', '<extras>' . $book->extras . '</extras>', false, true, 'XML');\r
                $flex->addVariable('numerotation', $book->numerotation, false, true, 'String');\r
-               $flexLight->addVariable('theme', $theme->parametres->toStandardObject());\r
+               $flexLight->addVariable('theme', $theme->parametres->toStandardObject(),false,true,'JSONObject');\r
                $flexLight->addVariable('pages', count($pages));\r
                $flexLight->addVariable('fwidth', round($size[0]), false, true, 'Number');\r
                $flexLight->addVariable('fheight', round($size[1]), false, true, 'Number');\r
                $flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');\r
-               $flex->addVariable('index', $index);\r
-               $flex->addVariable('textes', $textes);\r
+               $flex->addVariable('index', $index,false,true,'JSONObject');\r
+               $flex->addVariable('textes', $textes,false,true,'JSONObject');\r
                foreach($pages as $i => $infos) {\r
                        $swffile = WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.swf';\r
                        if ($i == 1) {\r