From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 15 May 2012 14:51:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=69316960f07c7560ee29ec454c38158ad0dae552;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_widget/miniFluidbook.swf b/fluidbook/compile/_widget/miniFluidbook.swf
new file mode 100644
index 000000000..b69ed878b
Binary files /dev/null and b/fluidbook/compile/_widget/miniFluidbook.swf differ
diff --git a/fluidbook/compile/_widget/miniFluidbookCouv.swf b/fluidbook/compile/_widget/miniFluidbookCouv.swf
new file mode 100644
index 000000000..8f2358144
Binary files /dev/null and b/fluidbook/compile/_widget/miniFluidbookCouv.swf differ
diff --git a/fluidbook/tools/fwstk/nbproject/configs/Infos.properties b/fluidbook/tools/fwstk/nbproject/configs/Infos.properties
index e69de29bb..9624c44a0 100644
--- a/fluidbook/tools/fwstk/nbproject/configs/Infos.properties
+++ b/fluidbook/tools/fwstk/nbproject/configs/Infos.properties
@@ -0,0 +1 @@
+run.jvmargs=-Xmx2048m
diff --git a/fluidbook/tools/fwstk/nbproject/private/config.properties b/fluidbook/tools/fwstk/nbproject/private/config.properties
index 5aa2fea7b..2dc12851a 100644
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -1 +1 @@
-config=Extract_Links
+config=Infos
diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index a3838e51e..12e72ab29 100644
--- a/fluidbook/tools/fwstk/nbproject/private/private.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/private.properties
@@ -4,4 +4,4 @@ do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
-user.properties.file=C:\\Users\\Cube\\.netbeans\\7.1\\build.properties
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.1\\build.properties
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index e64261850..0c0b7fcfc 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -105,11 +105,24 @@ class wsDocument extends cubeMetier {
 		$fwstk->setArg('--infos');
 		$fwstk->execute();
 		$this->addToLog($fwstk);
-		$this->parseInfos($fwstk->output);
+		$out = $fwstk->output;
+
+		$pdfinfo = new cubeCommandLine('pdfinfo');
+		$pdfinfo->setPath(CONVERTER_PATH);
+		$pdfinfo->setArg('-box');
+		$pdfinfo->setArg('f', 1);
+		$pdfinfo->setArg('l', 100000);
+		$pdfinfo->setArg(null,$in);
+		$pdfinfo->execute();
+		$this->addToLog($pdfinfo);
+		$out.="\n";
+		$out.=$pdfinfo->output;
+
+		$this->parseInfos($out);
 
 		$this->conversionInfos->setPageNumber($this->generalInfos['pages']);
 
-		file_put_contents($this->infos, $fwstk->output);
+		file_put_contents($this->infos, $out);
 		$this->findCutDisposition();
 	}
 
@@ -226,9 +239,9 @@ class wsDocument extends cubeMetier {
 				for ($i = 1; $i <= $this->pages; $i++) {
 					$this->generalInfos['page'][$i] = array();
 				}
-			} elseif (preg_match('|Page ([0-9]+) (.*)Box: ([0-9.]*) ([0-9.]*) ([0-9.]*) ([0-9.]*)|iu', $line, $m)) {
+			} elseif (preg_match('|Page\s+([0-9]+)\s+(.*)Box:\s+([0-9.]*)\s+([0-9.]*)\s+([0-9.]*)\s+([0-9.]*)|iu', $line, $m)) {
 				$this->generalInfos['page'][$m[1]][strtolower($m[2])] = new wsBox($m[3], $m[4], $m[5], $m[6]);
-			} elseif (preg_match('|Page ([0-9]+) size: ([0-9.]*) pts x ([0-9.]*) pts|iu', $line, $m)) {
+			} elseif (preg_match('|Page\s+([0-9]+)\s+size:\s+([0-9.]*)[pts[:space:]]+x\s+([0-9.]*)\s+pts|iu', $line, $m)) {
 				$this->generalInfos['page'][$m[1]]['size'] = array($m[2], $m[3]);
 				if ($m[1] == 1) {
 					$this->generalInfos['size'][0] = $m[2];
diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index db0d3e136..e7bbb3423 100644
--- a/inc/ws/Util/packager/class.ws.packager.v1.php
+++ b/inc/ws/Util/packager/class.ws.packager.v1.php
@@ -151,7 +151,7 @@ class wsPackagerV1 extends wsPackagerHTML {
 			'bookmark' => 'bookmarkFlag',
 			'email_title' => 'emailTitle',
 			'email_body' => 'emailBody',
-			'email_editable' => 'emailEditable',
+			'email_editable' => 'emailEditable'
 		);
 
 		$more = array('id' => $this->book_id,