(no commit message)

diff --git a/fluidbook/tools/scour.php b/fluidbook/tools/scour.php
index 5db8bae89ba04eba688ee5e6555f68646a4db4ac..647b43c7e3551d13075647384b379ba214113707 100644 (file)
--- a/fluidbook/tools/scour.php
+++ b/fluidbook/tools/scour.php
@@ -3,12 +3,10 @@
 
 $dir = $argv[1];
 
-print_r($argv);
 
 $dr = opendir($dir);
 while ($file = readdir($dr)) {
        if (!preg_match('|p([0-9]*)\.svg|i', $file, $matches)) {
-               echo $file.' no match'."\n";
                continue;
        }
        $f = $dir . '/' . $file;

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index f645cacd6ca8f937ddd97fd769cec23028ec9b3e..e7a79b5b73349d2d4a3963a71f017df2bfd81eed 100644 (file)
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -136,6 +136,7 @@ class wsConversionSession {
                                $log = $dao->putLinksFromCSV($this->currentDoc->document_id);\r
                                $this->currentDoc->addToLog($log);\r
                        }\r
+                       $this->currentDoc->optimizeSVG();\r
                        $this->processedDoc++;\r
 \r
                        ob_flush();\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index fd5955fe9fed29531c7e81d5b48325e85a0524ba..d9be848965049163cecabfc0da673afd1b6f0a65 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -341,6 +341,7 @@ class wsDocument extends cubeMetier {
                foreach ($pages as $i) {\r
                        $this->processOnePage($i);\r
                }\r
+               $this->optimizeSVG();\r
        }\r
 \r
        public function getLinksAndTexts() {\r
@@ -572,13 +573,25 @@ class wsDocument extends cubeMetier {
                $svgFile = $this->out . '/html/p' . $page . '.svg';\r
                $svgOpt = $this->out . '/html/o' . $page . '.svg';\r
 \r
-               $pdf2svg = new cubeCommandLine('pdf2svg');\r
-               $pdf2svg->setPath(CONVERTER_PATH);\r
-               $pdf2svg->setArg(null, $this->cropped);\r
-               $pdf2svg->setArg(null, $svgFile);\r
-               $pdf2svg->setArg(null, $page);\r
-               $pdf2svg->execute();\r
-               $this->addToLog($pdf2svg, true, $page);\r
+               /* $pdf2svg = new cubeCommandLine('pdf2svg');\r
+                 $pdf2svg->setPath(CONVERTER_PATH);\r
+                 $pdf2svg->setArg(null, $this->cropped);\r
+                 $pdf2svg->setArg(null, $svgFile);\r
+                 $pdf2svg->setArg(null, $page);\r
+                 $pdf2svg->execute();\r
+                 $this->addToLog($pdf2svg, true, $page); */\r
+\r
+               $pdftocairo = new cubeCommandLine('pdftocairo');\r
+               $pdftocairo->setPath(CONVERTER_PATH);\r
+               $pdftocairo->setArg('f', $page);\r
+               $pdftocairo->setArg('l', $page);\r
+               $pdftocairo->setArg(null, '-svg');\r
+               $pdftocairo->setArg(null, '-cropbox');\r
+               $pdftocairo->setArg(null, $this->cropped);\r
+               $pdftocairo->setArg(null, $svgFile);\r
+               $pdftocairo->execute();\r
+               $this->addToLog($pdftocairo, true, $page);\r
+\r
 \r
                $svg = new DOMDocument();\r
                $svg->preserveWhiteSpace = false;\r