wip #3495 @1

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 6e982538b44090fe124f969152a2662b5e120d5f..ec155f234e5ed931e455185911c4a67873daada3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -624,7 +624,7 @@ class wsMaintenance
 
         self::_moveDocs(WS_DOCS, '/data/extranet/www/fluidbook/docs1', 250);
         self::_moveDocs('/data/extranet/www/fluidbook/docs1', '/data/extranet/www/fluidbook/docs2', 2000);
-        self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 5000);
+        self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 25000);
     }
 
     protected static function _moveDocs($from, $to, $keep, $batch = 250)

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 13e23d54ef4d92b0ae8fb2ff1d275631d4912cef..cd5da87c1512525c331bdf59c872c9459e71b664 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -555,7 +555,7 @@ class wsDocument extends cubeMetier
         $pdftoppm->setArg('-aa ' . $antialiasing);
         $pdftoppm->setArg('-aaVector ' . $antialiasing);
         $pdftoppm->setArg('r', $resolution);
-        $pdftoppm->setArg(null, $this->out . 'pdf/p' . $page . '.pdf');
+        $pdftoppm->setArg(null,  $this->getSplittedPDFPage($page));
         $pdftoppm->setArg(null, $tmp);
         $pdftoppm->execute();
         $this->addToLog($pdftoppm, true, $page);
@@ -686,10 +686,6 @@ 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);
@@ -697,7 +693,7 @@ class wsDocument extends cubeMetier
         $pdftocairo->setArg('r', 300);
         $pdftocairo->setArg(null, '-expand');
         $pdftocairo->setArg(null, '-svg');
-        $pdftocairo->setArg(null, $this->out . 'pdf/p' . $page . '.pdf');
+        $pdftocairo->setArg(null,  $this->getSplittedPDFPage($page));
         $pdftocairo->setArg(null, $svgFile);
         $pdftocairo->execute();
 
@@ -913,7 +909,7 @@ class wsDocument extends cubeMetier
                 $pdf2swf->setArg(null, '-T7');
                 $pdf2swf->setArg('set alignfonts');
             }
-            $pdf2swf->setArg(null, $this->out . 'pdf/p' . $page . '.pdf');
+            $pdf2swf->setArg(null, $this->getSplittedPDFPage($page));
             $pdf2swf->setArg('output', $this->out . $prefix . $page . '.swf');
             $pdf2swf->execute();
 
@@ -933,6 +929,14 @@ class wsDocument extends cubeMetier
         }
     }
 
+    protected function getSplittedPDFPage($page){
+        $res=$this->out . 'pdf/p' . $page . '.pdf';
+        if(!file_exists($res)){
+            $this->splitDoc();
+        }
+        return $res;
+    }
+
     protected function _findMultiply($resolution)
     {
         $resolution /= $this->getResolutionRatio();
@@ -1005,7 +1009,7 @@ class wsDocument extends cubeMetier
         $pdf2swf->setArg('set subpixels', '0.01');
         $pdf2swf->setArg('set jpegquality', '1');
         $pdf2swf->setArg('set disablelinks');
-        $pdf2swf->setArg(null, $this->out . 'pdf/p' . $page . '.pdf');
+        $pdf2swf->setArg(null,  $this->getSplittedPDFPage($page));
         $pdf2swf->setArg('output', $this->out . 't' . $page . '.swf');
         $pdf2swf->execute();
         $this->addToLog($pdf2swf, true, $page);