fix #3351 @1.5

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index a1f50a134e4ef0a25b3ce100bd6d8b230940c8ae..13e23d54ef4d92b0ae8fb2ff1d275631d4912cef 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -326,7 +326,9 @@ class wsDocument extends cubeMetier
     public function splitDoc()
     {
         $this->addToLog('Split document');
-        mkdir($this->out . '/pdf');
+        if (!file_exists($this->out . '/pdf')) {
+            mkdir($this->out . '/pdf');
+        }
         $pdftk = new cubeCommandLine('pdftk');
         $pdftk->setPath(CONVERTER_PATH);
         $pdftk->setArg(null, $this->getCroppedPDF());
@@ -684,6 +686,10 @@ class wsDocument extends cubeMetier
     {
         $svgFile = $this->out . '/html/fp' . $page . '.svg';
 
+        if (!file_exists($this->out . 'pdf/p' . $page . '.pdf')) {
+            $this->splitDoc();
+        }
+
         $pdftocairo = new cubeCommandLine('pdftocairo');
         $pdftocairo->setPath(CONVERTER_PATH);
         $pdftocairo->setArg('f', 1);

diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index e206e25c62243ec30ba670fcc026ab7d9604b075..6b7a439504aca3e6ea2ae7d2faa19da9f88c150b 100644 (file)
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -155,7 +155,7 @@ class wsTools
 
         $expireoriginallimit = max(filemtime($original), filemtime(__FILE__));
 
-        $notexists = !file_exists($baseoptimized);
+        $notexists = !file_exists($baseoptimized) || filesize($baseoptimized) < 60;
         if (!$notexists) {
             $cleanerexpired = filemtime($baseoptimized) < filemtime('/usr/local/bin/svgcleaner');
             $originalexpired = filemtime($baseoptimized) < $expireoriginallimit;
@@ -342,5 +342,4 @@ class wsTools
     }
 
 
-
 }