(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 3dbd89d259abd72ba8166d0a6bb44aa13969622e..bb0e431cea68131f963f54d194722f7a09ed24d9 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -349,13 +349,21 @@ class wsDAOBook extends commonDAO {
 \r
        public function setChaptersFromOldFluidbook($book_id)\r
        {\r
+               $book = $this->selectById($book_id);\r
+               $n = explode(',', $book->numerotation);\r
+\r
                $xml = simplexml_load_file('http://ws.fluidbook.com/books/' . $book_id . '/data/links.xml');\r
                $res = array();\r
                $chapters = $xml->xpath('//chapters');\r
                foreach($chapters as $ch) {\r
                        $c = array();\r
                        $c['label'] = (string)$ch->txt;\r
-                       $c['page'] = (string)$ch->page;\r
+\r
+                       $p = intval((string)$ch->page);\r
+                       if ($p <= 0) {\r
+                               continue;\r
+                       }\r
+                       $c['page'] = $n[$p];\r
                        $c['level'] = intval((string)$ch->level);\r
                        $res[] = $c;\r
                }\r