(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index ddd323cf50888048ea525add6b224b90938cb9bd..2671d0ce13c7063b4580737c8333e150b18443d3 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -638,8 +638,8 @@ class wsDAOBook extends commonDAO {
                $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 = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH,10);\r
+               $flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH,10);\r
                $flex->addVariable('links', $links, false, true, 'JSONObject');\r
 \r
                $imagesassets = array();\r
@@ -828,6 +828,11 @@ class wsDAOBook extends commonDAO {
 \r
        public function indexPDF($book, $pages) {\r
                $indexPath = WS_BOOKS . '/search/' . $book->book_id;\r
+               \r
+               if(file_exists($indexPath) && filemtime($indexPath)>$book->composition_update){\r
+                       return;\r
+               }\r
+               \r
                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());\r
 \r
                if (file_exists($indexPath)) {\r

diff --git a/inc/ws/Util/packager/html5/class.ws.packager.html5.php b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
index 2d85465fcdd748f44016ce76ee4ada179c253e37..a7e157470197b9fa8c596a6e0d8f7c00cf8f1c4c 100644 (file)
--- a/inc/ws/Util/packager/html5/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/html5/class.ws.packager.html5.php
@@ -706,7 +706,7 @@ class wsPackagerHTML5 extends wsPackager {
 \r
        public function copyLinkFile($source, $dest, $video=false) {\r
                // TODO delete that return;\r
-               return;\r
+               //return;\r
                $origDir = WS_BOOKS . '/working/' . $this->book_id . '/';\r
                $types = array('mp4', 'ogv', 'webm', 'jpg');\r
                if ($video) {\r