From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 14 Dec 2010 12:33:36 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d62e5ada6f1c29277ff8353dc943d8e6d5596765;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index c0c997fad..fe57c4c05 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -492,7 +492,7 @@ class wsFlash extends cubeFlashGateway {
 		}
 
 		$absoluteURL = 'http://' . $_SERVER['HTTP_HOST'] . '/fluidbook/books/final/' . $this->args['book_id'] . '/';
-		$this->xml->addChild('compiledBook', $absoluteURL . 'index.swf?base=' . $absoluteURL);
+		$this->xml->addChild('compiledBook', '/fluidbook/compile/index.swf?base=' . $absoluteURL);
 	}
 }
 
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 3ed63bdd5..171bfe1d6 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -62,7 +62,7 @@ class wsDocument extends cubeMetier {
 		$this->infos = $this->out . 'infos.txt';
 		if (!file_exists($this->out)) {
 			mkdir($this->out, 0755, true);
-			mkdir($this->out . '/logs/');
+			mkdir($this->log,0755);
 		}
 		$this->cropped = $this->out . 'crop.pdf';
 		$this->uncropped = $this->out . 'uncrop.pdf';
@@ -527,7 +527,7 @@ class wsDocument extends cubeMetier {
 		$swfdump->setArg('t');
 		$swfdump->setArg(null, $file);
 		$swfdump->execute();
-		$this->addToLog($swfdump);
+		$this->addToLog($swfdump,true,$page);
 
 		str_replace('[01a]', '', $swfdump->output, $nbObjects);
 		if ($nbObjects > $maxObjects) {
@@ -638,14 +638,14 @@ disablelinks                Disable links.
 				$multiply = 1;
 			} elseif ($method == self::POLY2BITMAP) {
 				// Raster graphics, keep texts
-				$pdf2swf->setArg('poly2bitmap');
+				$pdf2swf->setArg('set poly2bitmap');
 				$multiply = self::$resolution2multiply[$resolution];
-				$pdf2swf->setArg('multiply', $multiply);
+				$pdf2swf->setArg('set multiply', $multiply);
 			} elseif ($method == self::BITMAP) {
 				// Raster all
-				$pdf2swf->setArg('bitmap');
+				$pdf2swf->setArg('set bitmap');
 				$multiply = self::$resolution2multiply[$resolution];
-				$pdf2swf->setArg('multiply', $multiply);
+				$pdf2swf->setArg('set multiply', $multiply);
 			}
 
 			$pdf2swf->setArg('stop');
@@ -709,7 +709,7 @@ disablelinks                Disable links.
 		$jpeg2swf->setArg('f');
 		$jpeg2swf->setArg(null, $this->out . 'barbare' . $page . '.jpg');
 		$jpeg2swf->execute();
-		$this->addToLog($jpeg2swf);
+		$this->addToLog($jpeg2swf,true,$page);
 		// Suppression du jpeg
 		@unlink($this->out . '/barbare' . $page . '.jpg',true,$page) ;
 
@@ -731,10 +731,10 @@ disablelinks                Disable links.
 		if (is_null($page)) {
 			$pointer = $this->common_log_pointer;
 		} else {
-			if (isset($this->pages_log_pointers[$page])) {
-				$pointer = $this->pages_log_pointers;
+			if (isset($this->pages_log_pointers[$page]) && is_resource($this->pages_log_pointers[$page])) {
+				$pointer = $this->pages_log_pointers[$page];
 			} else {
-				$pointer = fopen($this->log . '/p' . $page . '.log', 'a');
+				$pointer = fopen($this->log . '/p' . $page . '.log', 'w');
 				$this->pages_log_pointers[$page] = $pointer;
 			}
 		}