(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index e43a1764a9c1542306eeaf37107eeb38e5cdc567..79001320ddc17e83694adbbf1f9188887b1c9ece 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/extranet/Controlleur/class.extranet.core.php
@@ -312,6 +312,7 @@ class extranetCore extends cubeCore {
                $db->documents->date('integer', 0, false);\r
                $db->documents->localInfos('text', 0, false);\r
                $db->documents->generalInfos('text', 0, false);\r
+               $db->documents->conversionInfos('text', 0, false);\r
                $db->documents->bookmarks('text', 0, false);\r
                $db->documents->numberSections('text', 0, false);\r
                $db->documents->links('text', 0, false);\r

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 7c2eae3590b9cadd4c6cfc2b6eb846cb28984a95..9093e3030b28d4570145388e9f49fb7e99a357d8 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -32,6 +32,14 @@ class wsFlash extends cubeFlashGateway {
                        $li->creationDate = $this->args['creationDate'];\r
                        $li->modificationDate = $this->args['modificationDate'];\r
                        $data['localInfos'] = $li;\r
+\r
+                       $ci = new cubeObject();\r
+                       $ci->global=new cubeObject();\r
+                       $ci->resolution = 150;\r
+                       $ci->method = wsDocument::NORMAL;\r
+                       $ci->quality = 85;\r
+\r
+                       $data['conversionInfos'] = $ci;\r
                        $document = $dao->sauve($data);\r
                        $document->copyOriginal($infos['tmp_name']);\r
                }\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 4c3145b1fe5138bfd5a278b82ba6f210410191b8..70fef51f2cad6d680fc1b4f1724c73e188f3679f 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -1,7 +1,7 @@
 <?php\r
 class wsDAODocument extends extranetDAO {\r
        public static $normal = array('document_id', 'file', 'proprietaire', 'pages', 'date', 'numberSections');\r
-       public static $complex = array('localInfos', 'bookmarks', 'generalInfos', 'trim');\r
+       public static $complex = array('localInfos', 'bookmarks', 'generalInfos','conversionInfos', 'trim');\r
 \r
        public function singleton($r)\r
        {\r

diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 7f9d662d30bde4d98da5608476d7cfc6c2183a18..2c38f350642fdc70339b18c2bdabff6606e4bf9e 100644 (file)
--- a/inc/ws/Metier/_common.php
+++ b/inc/ws/Metier/_common.php
@@ -8,6 +8,7 @@ $__autoload['wsLangueTextes'] = dirname(__FILE__) . '/class.ws.langue.textes.php
 $__autoload['wsDocument'] = dirname(__FILE__) . '/class.ws.document.php';\r
 $__autoload['wsLink'] = dirname(__FILE__) . '/class.ws.link.php';\r
 $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';\r
+$__autoload['wsDocumentConversionInfos'] = dirname(__FILE__) . '/class.ws.document.conversioninfos.php';\r
 $__autoload['wsBox'] = dirname(__FILE__) . '/class.ws.box.php';\r
 $__autoload['wsIcone'] = dirname(__FILE__) . '/class.ws.icone.php';\r
 $__autoload['wsLang'] = dirname(__FILE__) . '/class.ws.lang.php';\r

diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 171bfe1d68c69c4b417fed2c7828b526ef3d7244..74bbb0e62f833a351c10b649b8a44f173991b47a 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -17,6 +17,7 @@ class wsDocument extends cubeMetier {
        protected $date;\r
        protected $localInfos;\r
        protected $generalInfos;\r
+       protected $conversionInfos;\r
        protected $bookmarks;\r
        protected $numberSections;\r
        protected $links;\r
@@ -36,9 +37,6 @@ class wsDocument extends cubeMetier {
        protected $cropped;\r
        protected $uncropped;\r
 \r
-       private $_basicInfos = null;\r
-       private $_advancedInfos = null;\r
-\r
        const NORMAL = 0;\r
        const FLATTEN = 1;\r
        const POLY2BITMAP = 2;\r