wip #3634 @3

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 30f0c12c2efc259379afd08cf24e056a6d9e3e38..db20a09a0f5b55646c140c64ae45e089ebc04f2f 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -609,22 +609,22 @@ class wsMaintenance
     {
         global $core;
         cubePHP::neverStop();
-        $r = $core->con->select('SELECT document_id FROM documents WHERE document_id NOT IN (SELECT document_id FROM book_pages)');
-        while ($r->fetch()) {
-            if (file_exists(WS_DOCS . '/' . $r->document_id)) {
-                $rm = new cubeCommandLine('rm');
-                $rm->setPath(CONVERTER_PATH);
-                $rm->setArg('r');
-                $rm->setArg('f');
-                $rm->setArg(null, WS_DOCS . '/' . $r->document_id . '/');
-                $rm->execute();
-                echo $rm->commande . "<br />";
-            }
-        }
-
-        self::_moveDocs(WS_DOCS, '/data/extranet/www/fluidbook/docs1', 150);
-        self::_moveDocs('/data/extranet/www/fluidbook/docs1', '/data/extranet/www/fluidbook/docs2', 500);
-        self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 100000);
+//        $r = $core->con->select('SELECT document_id FROM documents WHERE document_id NOT IN (SELECT document_id FROM book_pages)');
+//        while ($r->fetch()) {
+//            if (file_exists(WS_DOCS . '/' . $r->document_id)) {
+//                $rm = new cubeCommandLine('rm');
+//                $rm->setPath(CONVERTER_PATH);
+//                $rm->setArg('r');
+//                $rm->setArg('f');
+//                $rm->setArg(null, WS_DOCS . '/' . $r->document_id . '/');
+//                $rm->execute();
+//                echo $rm->commande . "<br />";
+//            }
+//        }
+
+//        self::_moveDocs(WS_DOCS, '/data/extranet/www/fluidbook/docs1', 150);
+//        self::_moveDocs('/data/extranet/www/fluidbook/docs1', '/data/extranet/www/fluidbook/docs2', 500);
+//        self::_moveDocs('/data/extranet/www/fluidbook/docs2', '/data/extranet/www/fluidbook/docs3', 100000);
     }
 
     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 cd5da87c1512525c331bdf59c872c9459e71b664..cd78df410052d5385606990641329003baa4bbef 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->getSplittedPDFPage($page));
+        $pdftoppm->setArg(null, $this->getSplittedPDFPage($page));
         $pdftoppm->setArg(null, $tmp);
         $pdftoppm->execute();
         $this->addToLog($pdftoppm, true, $page);
@@ -693,7 +693,7 @@ class wsDocument extends cubeMetier
         $pdftocairo->setArg('r', 300);
         $pdftocairo->setArg(null, '-expand');
         $pdftocairo->setArg(null, '-svg');
-        $pdftocairo->setArg(null,  $this->getSplittedPDFPage($page));
+        $pdftocairo->setArg(null, $this->getSplittedPDFPage($page));
         $pdftocairo->setArg(null, $svgFile);
         $pdftocairo->execute();
 
@@ -929,9 +929,10 @@ class wsDocument extends cubeMetier
         }
     }
 
-    protected function getSplittedPDFPage($page){
-        $res=$this->out . 'pdf/p' . $page . '.pdf';
-        if(!file_exists($res)){
+    protected function getSplittedPDFPage($page)
+    {
+        $res = $this->out . 'pdf/p' . $page . '.pdf';
+        if (!file_exists($res)) {
             $this->splitDoc();
         }
         return $res;
@@ -1009,7 +1010,7 @@ class wsDocument extends cubeMetier
         $pdf2swf->setArg('set subpixels', '0.01');
         $pdf2swf->setArg('set jpegquality', '1');
         $pdf2swf->setArg('set disablelinks');
-        $pdf2swf->setArg(null,  $this->getSplittedPDFPage($page));
+        $pdf2swf->setArg(null, $this->getSplittedPDFPage($page));
         $pdf2swf->setArg('output', $this->out . 't' . $page . '.swf');
         $pdf2swf->execute();
         $this->addToLog($pdf2swf, true, $page);
@@ -1081,29 +1082,24 @@ class wsDocument extends cubeMetier
             return self::$_docsDir[$id];
         }
 
-        $new = WS_FILES . '/docs/' . $id . '/';
-        $old = WS_FILES . '/docs1/' . $id . '/';
-        $veryold = WS_FILES . '/docs2/' . $id . '/';
-        $vveryold = WS_FILES . '/docs3/' . $id . '/';
-
-        if (file_exists($new . 'p1.swf')) {
-            self::$_docsDir[$id] = $new;
-            return $new;
-        } elseif (file_exists($old . 'p1.swf')) {
-            self::$_docsDir[$id] = $old;
-            return $old;
-        } else if (file_exists($veryold . 'p1.swf')) {
-            self::$_docsDir[$id] = $veryold;
-            return $veryold;
-        } else if (file_exists($vveryold . 'p1.swf')) {
-            self::$_docsDir[$id] = $vveryold;
-            return $vveryold;
-        }
-        if (!file_exists($new)) {
-            mkdir($new, 0777, true);
-        }
-        self::$_docsDir[$id] = $new;
-        return $new;
+        $d = 5;
+        for ($i = 0; $i <= $d; $i++) {
+            $docs = 'docs';
+            if ($i > 0) {
+                $docs .= '' . $i;
+            }
+            $dir = WS_FILES . '/' . $docs . '/' . $id . '/';
+            if (file_exists($dir . 'p1.swf')) {
+                self::$_docsDir[$id] = $dir;
+                return $dir;
+            }
+        }
+        $d0 = WS_FILES . '/docs/' . $id . '/';
+        if (!file_exists($d0)) {
+            mkdir($d0, 0777, true);
+        }
+        self::$_docsDir[$id] = $d0;
+        return $d0;
     }
 
     public static function makeHTML5FilesIfNotExists($document_id, $document_page)