From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 16 Oct 2011 17:21:20 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=360fac34526e1029307b72075733ed7748d0d1a3;p=cubeextranet.git

---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f9e74551d..12a5b1345 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -689,7 +689,7 @@ class wsDAOBook extends commonDAO {
 
 		$this->compileFlex($book_id, $complete, $compilerDir, $finalDir, $filesToCopy, $book, $pages, $flex, $flexLight);
 
-		$flexLight->addVariable('checksum', $hash, false, true, 'String');
+
 		$res .= $flex->compile() . "\n\n-------------------\n\n";
 		$flexLight->addVariable('datasSize', filesize($compilerDir . '/FluidbookDatas.swf'));
 		$res .= $flexLight->compile();
@@ -751,11 +751,21 @@ class wsDAOBook extends commonDAO {
 			$lib10 . 'flex.swc',
 			$lib10 . 'framework.swc',
 		);
-		$flex = new cubeFlexCompiler('FluidbookAirProjector' . $book_id, $compilerDir, 'com.fluidbook.player.AIRMain', $libs, '/usr/local/flex_sdk_4.5/bin/mxmlc', 'air', 45,800,600,true);
+
+		wsSVN::updateToLastRevision();
+
+		$swf = 'FluidbookAirProjector' . $book_id;
+		$flex = new cubeFlexCompiler($swf, $compilerDir, 'com.fluidbook.player.AIRMain', $libs, '/usr/local/flex/bin/mxmlc', 10, 45, 800, 600, true);
 
 		$this->compileFlex($book_id, true, $compilerDir, $finalDir, $filesToCopy, $book, $pages, $flex, $flex);
+		$res = $flex->compile();
 
-		return $flex->compile();
+		$air = new cubeAIRCompiler($compilerDir . '/' . $swf . '.swf', '/usr/local/flex/bin', $compilerDir, '2.7');
+		$air->setApplicationDatas('com.fluidbook' . $book_id, $book->parametres->titre, $book->parametres->titre, cubeText::str2URL($book->parametres->titre), $book->parametres->lang);
+		$air->setInitialWindow($book->parametres->titre);
+		$res.=$air->compile();
+
+		return $res;
 	}
 
 	public function compileFlex($book_id, $complete, $compilerDir, $finalDir, &$filesToCopy, $book, $pages, $flex, $flexLight) {
@@ -947,6 +957,8 @@ class wsDAOBook extends commonDAO {
 		$flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);
 		$flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');
 		$flexLight->addFont(FONT_PATH . '/FluidbookLoader.ttf', 'LoaderFont', 'Numerals');
+
+		$flexLight->addVariable('checksum', $hash, false, true, 'String');
 	}
 
 	public function compileWidget($book, $pages) {
diff --git a/inc/ws/Util/_common.php b/inc/ws/Util/_common.php
index 5edcef271..0b86df328 100644
--- a/inc/ws/Util/_common.php
+++ b/inc/ws/Util/_common.php
@@ -13,4 +13,5 @@ $__autoload['wsHTML5Compiler'] = dirname(__FILE__) . '/html5/class.ws.html5.comp
 $__autoload['wsHTML5Link'] = dirname(__FILE__) . '/html5/class.ws.html5.links.php';
 $__autoload['wsPDFFontExtractor'] = dirname(__FILE__) . '/fontextractor/class.ws.pdf.fontextractor.php';
 $__autoload['wsPDFFont'] = dirname(__FILE__) . '/fontextractor/class.ws.pdf.font.php';
+$__autoload['wsSVN'] = dirname(__FILE__) . '/class.ws.svn.php';
 ?>
\ No newline at end of file
diff --git a/inc/ws/Util/class.ws.svn.php b/inc/ws/Util/class.ws.svn.php
new file mode 100644
index 000000000..8d0fb1b02
--- /dev/null
+++ b/inc/ws/Util/class.ws.svn.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ * Description of class
+ *
+ * @author Cube
+ */
+class wsSVN {
+
+	public static function updateToLastRevision($onlyCore=true) {
+		$svn = new cubeCommandLine('svn');
+		$svn->setPath(CONVERTER_PATH);
+		if ($onlyCore) {
+			$svn->setManualArg('up /home/ws/sources/fluidbook/_src/com/fluidbook/*');
+		} else {
+			$svn->setManualArg('up /home/ws/sources/*');
+		}
+		$svn->execute();
+	}
+
+}
+
+?>
diff --git a/inc/ws/Util/packager/class.ws.packager.air.php b/inc/ws/Util/packager/class.ws.packager.air.php
new file mode 100644
index 000000000..21fec508b
--- /dev/null
+++ b/inc/ws/Util/packager/class.ws.packager.air.php
@@ -0,0 +1,7 @@
+<?php
+
+class wsPackagerAIR extends wsPackager {
+	
+}
+
+?>