From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 12 May 2011 08:52:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4ec6755b168a3ac7cfcf25da2306563dbac210e0;p=cubeextranet.git

---

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