(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 5cd42969a6ea7bbb27b3f261e9be3719ec21da81..095d58cf1eee3477448e27550eb687f10282f02d 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -401,10 +401,11 @@ class wsDAOBook extends extranetDAO {
                return $res;\r
        }\r
 \r
-       public function makeTextsIndexes($book_id, &$index)\r
+       public function makeTextsIndexes($book_id, &$index, &$textes)\r
        {\r
                $pages = $this->getPagesOfBook($book_id);\r
                $index = array();\r
+               $textes = array();\r
                foreach($pages as $book_page => $infos) {\r
                        $file = ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.txt';\r
                        $text = file_get_contents($file);\r
@@ -412,6 +413,7 @@ class wsDAOBook extends extranetDAO {
                        $words = cubeSearch::getWords($text, false, true, false);\r
 \r
                        $this->fillIndexWithWords($index, $book_page, $words);\r
+                       $textes[$book_page] = cubeText::removeAccents(cubeText::condenseWhite($text));\r
                }\r
                ksort($index);\r
        }\r
@@ -459,8 +461,7 @@ class wsDAOBook extends extranetDAO {
                $daoTheme = new wsDAOTheme($this->con);\r
                $theme = $daoTheme->getThemeOfBook($book_id);\r
 \r
-               $this->makeTextsIndexes($book_id, $index);\r
-\r
+               $this->makeTextsIndexes($book_id, $index, $textes);\r
 \r
                $flex = new cubeFlexCompiler('FluidbookDatas', ROOT . '/books/datasCompiler/' . $book_id, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH);\r
                $flex->addVariable('links', $book->links);\r
@@ -474,6 +475,7 @@ class wsDAOBook extends extranetDAO {
                $flex->addVariable('fwidth', $size[0], false, true, 'Number');\r
                $flex->addVariable('fheight', $size[1], false, true, 'Number');\r
                $flex->addVariable('index', $index);\r
+               $flex->addVariable('textes', $textes);\r
                foreach($pages as $i => $infos) {\r
                        $flex->addBitmap(ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
                }\r