(no commit message)

diff --git a/fluidbook/compile/_widget/miniFluidbook.swf b/fluidbook/compile/_widget/miniFluidbook.swf
new file mode 100644 (file)
index 0000000..b69ed87
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 (file)
index 0000000..8f23581
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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9624c44a04906c5eb1df62101d48eab57e8b3a0d 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/configs/Infos.properties
+++ b/fluidbook/tools/fwstk/nbproject/configs/Infos.properties
@@ -0,0 +1 @@
+run.jvmargs=-Xmx2048m\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/config.properties b/fluidbook/tools/fwstk/nbproject/private/config.properties
index 5aa2fea7bf417086c81ccabfe06cb2d78e4134e3..2dc12851a7a69957dcc55ec1989a3c2cb55652b2 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/private/config.properties
+++ b/fluidbook/tools/fwstk/nbproject/private/config.properties
@@ -1 +1 @@
-config=Extract_Links\r
+config=Infos\r

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.properties b/fluidbook/tools/fwstk/nbproject/private/private.properties
index a3838e51e587dbfb39284fc960dd3fa35b9de515..12e72ab294735e442e8b6f4faebe4b58b6833e1b 100644 (file)
--- 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\r
 javac.debug=true\r
 javadoc.preview=true\r
-user.properties.file=C:\\Users\\Cube\\.netbeans\\7.1\\build.properties\r
+user.properties.file=C:\\Users\\Vincent\\.netbeans\\7.1\\build.properties\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index e642618508e6aa0f0b8da251efe48995076a5b8d..0c0b7fcfcb75afb2ae89ecba5ddb6d5e6d2c3786 100644 (file)
--- 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');\r
                $fwstk->execute();\r
                $this->addToLog($fwstk);\r
-               $this->parseInfos($fwstk->output);\r
+               $out = $fwstk->output;\r
+\r
+               $pdfinfo = new cubeCommandLine('pdfinfo');\r
+               $pdfinfo->setPath(CONVERTER_PATH);\r
+               $pdfinfo->setArg('-box');\r
+               $pdfinfo->setArg('f', 1);\r
+               $pdfinfo->setArg('l', 100000);\r
+               $pdfinfo->setArg(null,$in);\r
+               $pdfinfo->execute();\r
+               $this->addToLog($pdfinfo);\r
+               $out.="\n";\r
+               $out.=$pdfinfo->output;\r
+\r
+               $this->parseInfos($out);\r
 \r
                $this->conversionInfos->setPageNumber($this->generalInfos['pages']);\r
 \r
-               file_put_contents($this->infos, $fwstk->output);\r
+               file_put_contents($this->infos, $out);\r
                $this->findCutDisposition();\r
        }\r
 \r
@@ -226,9 +239,9 @@ class wsDocument extends cubeMetier {
                                for ($i = 1; $i <= $this->pages; $i++) {\r
                                        $this->generalInfos['page'][$i] = array();\r
                                }\r
-                       } elseif (preg_match('|Page ([0-9]+) (.*)Box: ([0-9.]*) ([0-9.]*) ([0-9.]*) ([0-9.]*)|iu', $line, $m)) {\r
+                       } elseif (preg_match('|Page\s+([0-9]+)\s+(.*)Box:\s+([0-9.]*)\s+([0-9.]*)\s+([0-9.]*)\s+([0-9.]*)|iu', $line, $m)) {\r
                                $this->generalInfos['page'][$m[1]][strtolower($m[2])] = new wsBox($m[3], $m[4], $m[5], $m[6]);\r
-                       } elseif (preg_match('|Page ([0-9]+) size: ([0-9.]*) pts x ([0-9.]*) pts|iu', $line, $m)) {\r
+                       } elseif (preg_match('|Page\s+([0-9]+)\s+size:\s+([0-9.]*)[pts[:space:]]+x\s+([0-9.]*)\s+pts|iu', $line, $m)) {\r
                                $this->generalInfos['page'][$m[1]]['size'] = array($m[2], $m[3]);\r
                                if ($m[1] == 1) {\r
                                        $this->generalInfos['size'][0] = $m[2];\r

diff --git a/inc/ws/Util/packager/class.ws.packager.v1.php b/inc/ws/Util/packager/class.ws.packager.v1.php
index db0d3e136e1437599274ab0899111f66670196b6..e7bbb342371dcafec015a6e6c34c7e13a7cbf0c3 100644 (file)
--- 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,