From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 4 Jan 2011 17:50:43 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2d2f668775a5818ae7d78744087469fde8037e50;p=cubeextranet.git

---

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index e43a1764a..79001320d 100644
--- 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);
 		$db->documents->localInfos('text', 0, false);
 		$db->documents->generalInfos('text', 0, false);
+		$db->documents->conversionInfos('text', 0, false);
 		$db->documents->bookmarks('text', 0, false);
 		$db->documents->numberSections('text', 0, false);
 		$db->documents->links('text', 0, false);
diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 7c2eae359..9093e3030 100644
--- 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'];
 			$li->modificationDate = $this->args['modificationDate'];
 			$data['localInfos'] = $li;
+
+			$ci = new cubeObject();
+			$ci->global=new cubeObject();
+			$ci->resolution = 150;
+			$ci->method = wsDocument::NORMAL;
+			$ci->quality = 85;
+
+			$data['conversionInfos'] = $ci;
 			$document = $dao->sauve($data);
 			$document->copyOriginal($infos['tmp_name']);
 		}
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 4c3145b1f..70fef51f2 100644
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -1,7 +1,7 @@
 <?php
 class wsDAODocument extends extranetDAO {
 	public static $normal = array('document_id', 'file', 'proprietaire', 'pages', 'date', 'numberSections');
-	public static $complex = array('localInfos', 'bookmarks', 'generalInfos', 'trim');
+	public static $complex = array('localInfos', 'bookmarks', 'generalInfos','conversionInfos', 'trim');
 
 	public function singleton($r)
 	{
diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index 7f9d662d3..2c38f3506 100644
--- 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';
 $__autoload['wsLink'] = dirname(__FILE__) . '/class.ws.link.php';
 $__autoload['wsDocumentLocalInfos'] = dirname(__FILE__) . '/class.ws.document.localinfos.php';
+$__autoload['wsDocumentConversionInfos'] = dirname(__FILE__) . '/class.ws.document.conversioninfos.php';
 $__autoload['wsBox'] = dirname(__FILE__) . '/class.ws.box.php';
 $__autoload['wsIcone'] = dirname(__FILE__) . '/class.ws.icone.php';
 $__autoload['wsLang'] = dirname(__FILE__) . '/class.ws.lang.php';
diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 171bfe1d6..74bbb0e62 100644
--- 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;
 	protected $localInfos;
 	protected $generalInfos;
+	protected $conversionInfos;
 	protected $bookmarks;
 	protected $numberSections;
 	protected $links;
@@ -36,9 +37,6 @@ class wsDocument extends cubeMetier {
 	protected $cropped;
 	protected $uncropped;
 
-	private $_basicInfos = null;
-	private $_advancedInfos = null;
-
 	const NORMAL = 0;
 	const FLATTEN = 1;
 	const POLY2BITMAP = 2;