From da3955aeeab1ac358a37a56980dacc178ef7d94f Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 17 Jan 2020 14:01:06 +0000 Subject: [PATCH] fix #3351 @1.5 --- inc/ws/Metier/class.ws.document.php | 8 +++++++- inc/ws/Util/class.ws.tools.php | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index a1f50a134..13e23d54e 100644 --- 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 e206e25c6..6b7a43950 100644 --- 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 } - } -- 2.39.5