(no commit message)

diff --git a/inc/extranet/Controlleur/class.ws.flash.php b/inc/extranet/Controlleur/class.ws.flash.php
index 0759422ae4b9fe33072ed91de3933d066ae0244e..a336d7a0339caf408cffaeee6099240dbd45f364 100644 (file)
--- a/inc/extranet/Controlleur/class.ws.flash.php
+++ b/inc/extranet/Controlleur/class.ws.flash.php
@@ -31,6 +31,7 @@ class wsFlash extends cubeFlashGateway {
                        $document = $dao->sauve($data);\r
                        $document->copyOriginal($infos['tmp_name']);\r
                        $document->getInfos();\r
+                       $document->getTextes();\r
                }\r
                $this->xml->addChild('document_id', $document->document_id);\r
        }\r

diff --git a/inc/extranet/Metier/class.ws.document.php b/inc/extranet/Metier/class.ws.document.php
index 3681dc0046bba76a11bdb5cc82b5f79d928158dc..071a018364145f4dd0cefb8d8a7321b7b8acce4c 100644 (file)
--- a/inc/extranet/Metier/class.ws.document.php
+++ b/inc/extranet/Metier/class.ws.document.php
@@ -11,6 +11,8 @@ class wsDocument extends cubeMetier {
        protected $out;\r
        protected $in;\r
        protected $log;\r
+       protected $log_pointer;\r
+       protected $infos;\r
 \r
        protected $pages;\r
 \r
@@ -19,21 +21,59 @@ class wsDocument extends cubeMetier {
                $this->out = ROOT . '/docs/' . $this->document_id . '/';\r
                $this->log = $this->out . 'log.txt';\r
                $this->in = $this->out . 'original.pdf';\r
+               $this->infos = $this->out . 'infos.txt';\r
+               $this->textes = $this->out . 'textes.txt';\r
                if (!file_exists($this->out)) {\r
                        mkdir($this->out, 0755, true);\r
                }\r
+               $this->log_pointer = fopen($this->log, 'a');\r
                move_uploaded_file($tmp_file, $this->in);\r
        }\r
 \r
        public function getInfos()\r
        {\r
-               echo 'pdfinfo';\r
-               $pdfinfo = new cubeCommandLine('pdfinfo', $this->log);\r
+               $pdfinfo = new cubeCommandLine('pdfinfo', null, false);\r
                $pdfinfo->setArg('-box');\r
                $pdfinfo->setArg('f', 1);\r
                $pdfinfo->setArg('l', 10000);\r
                $pdfinfo->setArg(null, $this->in);\r
                $pdfinfo->execute();\r
+               $this->addToLog($pdfinfo);\r
+\r
+               file_put_contents($this->infos, $pdfinfo->output);\r
+       }\r
+\r
+       public function getTexts()\r
+       {\r
+               echo 'pdftotext';\r
+               $pdftotext = new cubeCommandLine('pdftotext', null, true);\r
+               $pdftotext->setArg('q');\r
+               $pdftotext->setArg('f', 1);\r
+               $pdftotext->setArg('l', 10000);\r
+               $pdftotext->setArg('-eol', 'unix');\r
+               // $pdftotext->setArg('-nopgbrk');\r
+               $pdftotext->setArg('-enc', 'UTF-8');\r
+               $pdftotext->setArg(null, $this->in);\r
+               $pdftotext->setArg(null, $this->textes);\r
+               $pdftotext->execute();\r
+               $this->addToLog($pdftotext);\r
+       }\r
+\r
+       public function makeThumbs()\r
+       {\r
+       }\r
+\r
+       public function addToLog($cl)\r
+       {\r
+               $c = '---' . "\n" . $cl->commande . "\n\n" . $cl->output . "\n--\n";\r
+               fwrite($this->log_pointer, $c);\r
+       }\r
+\r
+       public function __destruct()\r
+       {\r
+               if (isset($this->log_pointer)) {\r
+                       fclose($this->log_pointer);\r
+               }\r
        }\r
 }\r
 \r