(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 99ca60267e1fd27bf299ba02e541366b00dd5840..78e62e52f1816a6f0734bfd2195154c1f3dca191 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -66,7 +66,7 @@ define('WORKER_PREFIX', 'worker.');
 \r
 define('CACHE', ROOT . '/cache');\r
 \r
-define('SESSION_LIFETIME', 3600 * 10);\r
+define('SESSION_LIFETIME', 3600 * 24 * 10);\r
 define('L10N', dirname(__FILE__) . '/../l10n');\r
 \r
 define('JS_PATH', WEBROOT . '/js');\r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 7227e37a77525d8bf9923383929e6b2d41763cf3..6f121e4f9c04e7728e5327c437c30fc2ee557d88 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -44,6 +44,7 @@ class wsDocument extends cubeMetier {
        const BITMAP = 3;\r
        const BARBARE_PNM = 4;\r
        const BARBARE_GS = 5;\r
+       const MAX = 5;\r
 \r
        const PNM_FILL = 2;\r
 \r
@@ -305,6 +306,10 @@ class wsDocument extends cubeMetier {
        {\r
                // $this->makeRealShot($page);\r
                if ($force) {\r
+                       if ($page % 100 == 0) {\r
+                               sleep(10);\r
+                       }\r
+\r
                        $this->addToLog('Processing page #' . $page);\r
                        $this->makeMiniShot($page);\r
                        $this->makeSWFFiles($page);\r
@@ -482,6 +487,7 @@ class wsDocument extends cubeMetier {
                $this->addToLog($pdftoppm, true, $page);\r
 \r
                $jpegfile = $this->out . $prefix . $page . '.jpg';\r
+\r
                $ppmjpgfile = $this->out . 'ppm-' . cubeMath::fill($page, strlen((string)$this->pages)) . '.jpg';\r
                if (file_exists($ppmjpgfile)) {\r
                        rename($ppmjpgfile, $jpegfile);\r
@@ -552,6 +558,9 @@ class wsDocument extends cubeMetier {
                        }\r
 \r
                        if (!$written || $overflow || $overflowObjects) {\r
+                               if ($method == self::MAX) {\r
+                                       return;\r
+                               }\r
                                return $this->makeSWFFiles($page, $resolution, $quality, $storeAllChars, $maxObjects, $method + 1);\r
                        }\r
                }\r