(no commit message)

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 34b2e62309202e0a6429d2419928384b8b99571d..0f7281919f9f95e1ca2804e708ba97c746be2165 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -75,8 +75,8 @@ class wsDocument extends cubeMetier {
 \r
        public function getInfos($in = null, $force = false)\r
        {\r
-               if(is_null($in)){\r
-                       $in=$this->in;\r
+               if (is_null($in)) {\r
+                       $in = $this->in;\r
                }\r
 \r
                $fwstk = new cubeCommandLine('fwstk');\r
@@ -213,14 +213,18 @@ class wsDocument extends cubeMetier {
        public function globalOperations()\r
        {\r
                $this->getInfos();\r
-               $this->CropAndCut();\r
-               $this->getInfos($this->cropped, true);\r
-               $this->getLinks();\r
-               $this->getTexts();\r
+               if ($this->CropAndCut()) {\r
+                       $this->getInfos($this->cropped, true);\r
+               }\r
+               $this->getLinksAndTexts();\r
        }\r
 \r
        public function CropAndCut()\r
        {\r
+               if (!$this->isCropped()) {\r
+                       copy($this->in, $this->cropped);\r
+                       return false;\r
+               }\r
                if ($this->autocrop == 'trim') {\r
                        $this->trimDocument();\r
                } else {\r
@@ -229,7 +233,9 @@ class wsDocument extends cubeMetier {
 \r
                if ($this->autocut) {\r
                        $this->cutDocument($this->autocut);\r
+                       return true;\r
                }\r
+               return false;\r
        }\r
 \r
        public function cutDocument($mode)\r
@@ -289,9 +295,17 @@ class wsDocument extends cubeMetier {
                }\r
        }\r
 \r
-       public function getTexts()\r
+       public function getLinksAndTexts()\r
        {\r
-               $temp = cubeFiles::tempnam();\r
+               $fwstk = new cubeCommandLine('fwstk');\r
+               $fwstk->setPath(CONVERTER_PATH);\r
+               $fwstk->setArg('--input ' . $this->cropped);\r
+               $fwstk->setArg('--extractTexts ' . $this->out . 'p%d.txt');\r
+               $fwstk->setArg('--extractLinks ' . $this->out . 'p%d.csv');\r
+               $fwstk->execute();\r
+               $this->addToLog($fwstk);\r
+\r
+               /*$temp = cubeFiles::tempnam();\r
                $pdftotext = new cubeCommandLine('pdftotext', null, true);\r
                $pdftotext->setPath(CONVERTER_PATH);\r
                $pdftotext->setArg('q');\r
@@ -312,7 +326,7 @@ class wsDocument extends cubeMetier {
                        file_put_contents($this->out . 'p' . $i . '.txt', $txt);\r
                }\r
 \r
-               unlink($temp);\r
+               unlink($temp);*/\r
        }\r
 \r
        public function makeMiniShot($page)\r
@@ -672,16 +686,6 @@ disablelinks                Disable links.
                $this->addToLog($swfcombine);\r
        }\r
 \r
-       protected function getLinks()\r
-       {\r
-               $fwstk = new cubeCommandLine('fwstk');\r
-               $fwstk->setPath(CONVERTER_PATH);\r
-               $fwstk->setArg('--input ' . $this->cropped);\r
-               $fwstk->setArg('--extractLinks ' . $this->out . 'p%d.csv');\r
-               $fwstk->execute();\r
-               $this->addToLog($fwstk);\r
-       }\r
-\r
        protected function pdf2swfBarbare($page, $resolution = 150, $quality = 85, $method = 4)\r
        {\r
                // Fabrique les images\r