(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index ceab97366fd6535431acbbd0b6705edee047a5a5..31d2506fad5629528d230e4d205995d92b716e12 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -686,9 +686,8 @@ class wsDAOBook extends commonDAO {
                if ($theme->parametres->logoLoader != '') {\r
                        $flexLight->addBitmap($themeRoot . $theme->parametres->logoLoader, 'logoLoader');\r
                }\r
-               if($theme->parametres->topBar!=''){\r
+               if ($theme->parametres->topBar != '') {\r
                        $flexLight->addBitmap($themeRoot . $theme->parametres->topBar, 'topBar');\r
-                       \r
                }\r
                if ($theme->parametres->logo != '') {\r
                        $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
@@ -807,20 +806,26 @@ class wsDAOBook extends commonDAO {
                        $lettre = cubeMath::toPDFLetter($p[0], true);\r
                        $page = $p[1];\r
 \r
+                       // Initialise l'intervale\r
                        if (is_null($currentRange)) {\r
                                $currentRange = array('lettre' => $lettre, 'start' => $page, 'end' => $page);\r
                                continue;\r
                        }\r
 \r
+                       // Poursuit le remplissage si la lettre est identique et si la page suivante est bien la page suivante dans le document\r
                        if ($currentRange['lettre'] == $lettre && $currentRange['end'] + 1 == $page) {\r
                                $currentRange['end'] = $page;\r
                                continue;\r
                        }\r
 \r
+                       // Ajoute l'intervale à la liste finale\r
                        $ranges[] = $currentRange;\r
-                       $currentRange = null;\r
+\r
+                       // Réinitialise l'intervale suivant\r
+                       $currentRange = array('lettre' => $lettre, 'start' => $page, 'end' => $page);\r
                }\r
 \r
+               // Ajoute la dernière\r
                if (!is_null($currentRange)) {\r
                        $ranges[] = $currentRange;\r
                }\r
@@ -834,6 +839,8 @@ class wsDAOBook extends commonDAO {
                        }\r
                }\r
 \r
+               fb($ranges);\r
+\r
                foreach ($ranges as $range) {\r
                        $args .= ' ' . $range['lettre'] . $range['start'];\r
                        if ($range['start'] == $range['end']) {\r
@@ -848,6 +855,9 @@ class wsDAOBook extends commonDAO {
                $pdftk->setPath(CONVERTER_PATH);\r
                $pdftk->setManualArg($args);\r
                $pdftk->execute();\r
+\r
+               fb($pdftk->commande);\r
+               fb($pdftk->output);\r
        }\r
 \r
 }\r