(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index c0c997fadada826e1ec6fb2348a0f8afd27f693d..fe57c4c059cd7f6a1fb8c532b5c4f7e77a8d072a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -492,7 +492,7 @@ class wsFlash extends cubeFlashGateway {
                }\r
 \r
                $absoluteURL = 'http://' . $_SERVER['HTTP_HOST'] . '/fluidbook/books/final/' . $this->args['book_id'] . '/';\r
-               $this->xml->addChild('compiledBook', $absoluteURL . 'index.swf?base=' . $absoluteURL);\r
+               $this->xml->addChild('compiledBook', '/fluidbook/compile/index.swf?base=' . $absoluteURL);\r
        }\r
 }\r
 \r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 3ed63bdd5db7279899b0a0ab30836d532c9dc93d..171bfe1d68c69c4b417fed2c7828b526ef3d7244 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -62,7 +62,7 @@ class wsDocument extends cubeMetier {
                $this->infos = $this->out . 'infos.txt';\r
                if (!file_exists($this->out)) {\r
                        mkdir($this->out, 0755, true);\r
-                       mkdir($this->out . '/logs/');\r
+                       mkdir($this->log,0755);\r
                }\r
                $this->cropped = $this->out . 'crop.pdf';\r
                $this->uncropped = $this->out . 'uncrop.pdf';\r
@@ -527,7 +527,7 @@ class wsDocument extends cubeMetier {
                $swfdump->setArg('t');\r
                $swfdump->setArg(null, $file);\r
                $swfdump->execute();\r
-               $this->addToLog($swfdump);\r
+               $this->addToLog($swfdump,true,$page);\r
 \r
                str_replace('[01a]', '', $swfdump->output, $nbObjects);\r
                if ($nbObjects > $maxObjects) {\r
@@ -638,14 +638,14 @@ disablelinks                Disable links.
                                $multiply = 1;\r
                        } elseif ($method == self::POLY2BITMAP) {\r
                                // Raster graphics, keep texts\r
-                               $pdf2swf->setArg('poly2bitmap');\r
+                               $pdf2swf->setArg('set poly2bitmap');\r
                                $multiply = self::$resolution2multiply[$resolution];\r
-                               $pdf2swf->setArg('multiply', $multiply);\r
+                               $pdf2swf->setArg('set multiply', $multiply);\r
                        } elseif ($method == self::BITMAP) {\r
                                // Raster all\r
-                               $pdf2swf->setArg('bitmap');\r
+                               $pdf2swf->setArg('set bitmap');\r
                                $multiply = self::$resolution2multiply[$resolution];\r
-                               $pdf2swf->setArg('multiply', $multiply);\r
+                               $pdf2swf->setArg('set multiply', $multiply);\r
                        }\r
 \r
                        $pdf2swf->setArg('stop');\r
@@ -709,7 +709,7 @@ disablelinks                Disable links.
                $jpeg2swf->setArg('f');\r
                $jpeg2swf->setArg(null, $this->out . 'barbare' . $page . '.jpg');\r
                $jpeg2swf->execute();\r
-               $this->addToLog($jpeg2swf);\r
+               $this->addToLog($jpeg2swf,true,$page);\r
                // Suppression du jpeg\r
                @unlink($this->out . '/barbare' . $page . '.jpg',true,$page) ;\r
 \r
@@ -731,10 +731,10 @@ disablelinks                Disable links.
                if (is_null($page)) {\r
                        $pointer = $this->common_log_pointer;\r
                } else {\r
-                       if (isset($this->pages_log_pointers[$page])) {\r
-                               $pointer = $this->pages_log_pointers;\r
+                       if (isset($this->pages_log_pointers[$page]) && is_resource($this->pages_log_pointers[$page])) {\r
+                               $pointer = $this->pages_log_pointers[$page];\r
                        } else {\r
-                               $pointer = fopen($this->log . '/p' . $page . '.log', 'a');\r
+                               $pointer = fopen($this->log . '/p' . $page . '.log', 'w');\r
                                $this->pages_log_pointers[$page] = $pointer;\r
                        }\r
                }\r