From 69316960f07c7560ee29ec454c38158ad0dae552 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 15 May 2012 14:51:29 +0000 Subject: [PATCH] --- fluidbook/compile/_widget/miniFluidbook.swf | Bin 0 -> 10266 bytes .../compile/_widget/miniFluidbookCouv.swf | Bin 0 -> 10235 bytes .../fwstk/nbproject/configs/Infos.properties | 1 + .../fwstk/nbproject/private/config.properties | 2 +- .../nbproject/private/private.properties | 2 +- inc/ws/Metier/class.ws.document.php | 21 ++++++++++++++---- inc/ws/Util/packager/class.ws.packager.v1.php | 2 +- 7 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 fluidbook/compile/_widget/miniFluidbook.swf create mode 100644 fluidbook/compile/_widget/miniFluidbookCouv.swf diff --git a/fluidbook/compile/_widget/miniFluidbook.swf b/fluidbook/compile/_widget/miniFluidbook.swf new file mode 100644 index 0000000000000000000000000000000000000000..b69ed878b5f5ae8195ffd6978674ed0cef26dd9e GIT binary patch literal 10266 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 BMVkNs literal 0 HcmV?d00001 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, -- 2.39.5