From 8d722966d3189200861e49f4950cd0d010de9fa1 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Sun, 6 Mar 2011 09:16:51 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.conversion.session.php  | 2 ++
 inc/ws/Controlleur/class.ws.flash.php               | 6 ++++++
 inc/ws/Metier/class.ws.document.conversioninfos.php | 4 ++++
 inc/ws/Metier/class.ws.document.php                 | 7 ++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index f9b60b5c4..6719eb66a 100644
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -90,6 +90,8 @@ class wsConversionSession {
 			if (!$this->reload) {
 				$this->currentDoc->globalOperations();
 				$dao->putLinksFromCSV($this->currentDoc->document_id);
+			} else if ($this->documentsPages[$doc->document_id] == 'all') {
+				$this->currentDoc->globalOperations();
 			}
 			if ($this->documentsPages[$doc->document_id] == 'all') {
 				$docPages = range(1, $doc->generalInfos['pages']);
diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 11c5cd463..c604a5122 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -79,6 +79,12 @@ class wsFlash extends cubeFlashGateway {
 	{
 		global $core;
 
+		if ($this->args['reloadDocs'] == '1') {
+			foreach($this->args['documents'] as $document_id => $pages) {
+				$this->args['documents'][$document_id] = 'all';
+			}
+		}
+
 		$dao = new wsDAODocument($core->con);
 		$_SESSION['conversionSession'] = $this->args['documents'];
 		$_SESSION['conversionSessionReload'] = true;
diff --git a/inc/ws/Metier/class.ws.document.conversioninfos.php b/inc/ws/Metier/class.ws.document.conversioninfos.php
index ab95a1639..76876afbd 100644
--- a/inc/ws/Metier/class.ws.document.conversioninfos.php
+++ b/inc/ws/Metier/class.ws.document.conversioninfos.php
@@ -30,6 +30,10 @@ class wsDocumentConversionInfos {
 
 	public function updatePages($pages, $resolution, $quality, $method, $objects)
 	{
+		if ($pages == 'all') {
+			$pages = array_keys($this->pages);
+		}
+
 		foreach($pages as $page) {
 			$this->updatePage($page, $resolution, $quality, $method, $objects);
 		}
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index ddbdadce3..de7c5cbba 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -97,10 +97,10 @@ class wsDocument extends cubeMetier {
 			mkdir($out, 0777, true);
 		}
 
-		$pdfextract = new cubeCommandeLine('pdfextract');
-		$pdfextract->setCd($out);
+		$pdfextract = new cubeCommandLine('pdfextract');
+		$pdfextract->cd($out);
 		$pdfextract->setPath(CONVERTER_PATH);
-		$pdfextract->setArg('', $this->in);
+		$pdfextract->setArg(null,$this->cropped);
 		$pdfextract->execute();
 		$this->addToLog($pdfextract);
 	}
@@ -263,6 +263,7 @@ class wsDocument extends cubeMetier {
 			$this->getInfos($this->cropped, true);
 		}
 		$this->getLinksAndTexts();
+		$this->extractFonts();
 	}
 
 	public function CropAndCut()
-- 
2.39.5