wip #3135

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index 39f3d105fe80924371bbd4323d9bc57ad58e61b8..fb9eb8309692ab339928aa840da349ae3647900b 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -6,11 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="fix #2353 @6">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/LayoutStripper.java" afterDir="false" />
-    </list>
+    <list default="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wip #3135" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -464,7 +460,7 @@
       <workItem from="1542650839553" duration="56000" />
       <workItem from="1542710796466" duration="980000" />
       <workItem from="1542711819188" duration="1661000" />
-      <workItem from="1570806151720" duration="789000" />
+      <workItem from="1570806151720" duration="850000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -529,7 +525,14 @@
       <option name="project" value="LOCAL" />
       <updated>1542716707709</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="wip #3135">
+      <created>1570806981084</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1570806981084</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TodoView">
@@ -564,7 +567,8 @@
     <MESSAGE value="wait #1866 @6" />
     <MESSAGE value="fix #2243 @0:40" />
     <MESSAGE value="fix #2353 @6" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix #2353 @6" />
+    <MESSAGE value="wip #3135" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #3135" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 7ad0f52c5200818f6289322dd7ffc483bce553bc..a1f50a134e4ef0a25b3ce100bd6d8b230940c8ae 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -404,7 +404,7 @@ class wsDocument extends cubeMetier
 
     public function getLinks()
     {
-        $fwstk = new cubeCommandLine('fwstk.sh');
+        $fwstk = new CubeIT_CommandLine('fwstk.sh');
         $fwstk->setPath(CONVERTER_PATH);
         $fwstk->setArg('--input ' . $this->getCroppedPDF());
         $fwstk->setArg('--extractLinks ' . $this->out . 'p%d.csv');
@@ -415,13 +415,14 @@ class wsDocument extends cubeMetier
 
     public function getHighlightTextsData()
     {
-        $fwstk = new cubeCommandLine('fwstk.sh');
+        $fwstk = new CubeIT_CommandLine('fwstk.sh');
         $fwstk->setPath(CONVERTER_PATH);
         $fwstk->setArg('--input ' . $this->getCroppedPDF());
         $fwstk->setArg('--layout ' . $this->html . 'p%d.fby');
         $fwstk->setArg('--cmaps ' . $this->html);
         $fwstk->setArg('--fonts' . $this->out . 'fonts/web/');
         $fwstk->execute();
+        $fwstk->debug();
         $this->addToLog($fwstk);
     }
 
@@ -544,15 +545,15 @@ class wsDocument extends cubeMetier
         $pdftoppm = new cubeCommandLine('pdftoppm', null, true);
         $pdftoppm->setPath(CONVERTER_PATH);
 
-        $pdftoppm->setArg('f', $page);
-        $pdftoppm->setArg('l', $page);
+        $pdftoppm->setArg('f', 1);
+        $pdftoppm->setArg('l', 1);
         $pdftoppm->setArg('-cropbox');
         $pdftoppm->setArg('-freetype ' . $freetype);
         $pdftoppm->setArg('-singlefile');
         $pdftoppm->setArg('-aa ' . $antialiasing);
         $pdftoppm->setArg('-aaVector ' . $antialiasing);
         $pdftoppm->setArg('r', $resolution);
-        $pdftoppm->setArg(null, $in);
+        $pdftoppm->setArg(null, $this->out . 'pdf/p' . $page . '.pdf');
         $pdftoppm->setArg(null, $tmp);
         $pdftoppm->execute();
         $this->addToLog($pdftoppm, true, $page);
@@ -682,16 +683,15 @@ class wsDocument extends cubeMetier
     public function makeSVGFile($page)
     {
         $svgFile = $this->out . '/html/fp' . $page . '.svg';
-        $source = $this->getCroppedPDF();
 
         $pdftocairo = new cubeCommandLine('pdftocairo');
         $pdftocairo->setPath(CONVERTER_PATH);
-        $pdftocairo->setArg('f', $page);
-        $pdftocairo->setArg('l', $page);
+        $pdftocairo->setArg('f', 1);
+        $pdftocairo->setArg('l', 1);
         $pdftocairo->setArg('r', 300);
         $pdftocairo->setArg(null, '-expand');
         $pdftocairo->setArg(null, '-svg');
-        $pdftocairo->setArg(null, $source);
+        $pdftocairo->setArg(null, $this->out . 'pdf/p' . $page . '.pdf');
         $pdftocairo->setArg(null, $svgFile);
         $pdftocairo->execute();
 
@@ -1017,7 +1017,7 @@ class wsDocument extends cubeMetier
 
     public function addToLog($cl, $output = true, $page = null)
     {
-        if ($cl instanceof cubeCommandLine) {
+        if ($cl instanceof cubeCommandLine || $cl instanceof CubeIT_CommandLine) {
             $c = '--- Exécuté en ' . $cl->execTime . " s\n" . $cl->commande . "\n\n";
             if ($output) {
                 $c .= $cl->output . "\n\n";