From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 8 Oct 2012 15:43:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=208cfac23b041cc8c37b420f05e89242d1f0e5ec;p=cubeextranet.git

---

diff --git a/fluidbook/tools/scour.php b/fluidbook/tools/scour.php
index 5db8bae89..647b43c7e 100644
--- a/fluidbook/tools/scour.php
+++ b/fluidbook/tools/scour.php
@@ -3,12 +3,10 @@
 
 $dir = $argv[1];
 
-print_r($argv);
 
 $dr = opendir($dir);
 while ($file = readdir($dr)) {
 	if (!preg_match('|p([0-9]*)\.svg|i', $file, $matches)) {
-		echo $file.' no match'."\n";
 		continue;
 	}
 	$f = $dir . '/' . $file;
diff --git a/inc/ws/Controlleur/class.ws.conversion.session.php b/inc/ws/Controlleur/class.ws.conversion.session.php
index f645cacd6..e7a79b5b7 100644
--- a/inc/ws/Controlleur/class.ws.conversion.session.php
+++ b/inc/ws/Controlleur/class.ws.conversion.session.php
@@ -136,6 +136,7 @@ class wsConversionSession {
 				$log = $dao->putLinksFromCSV($this->currentDoc->document_id);
 				$this->currentDoc->addToLog($log);
 			}
+			$this->currentDoc->optimizeSVG();
 			$this->processedDoc++;
 
 			ob_flush();
diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index fd5955fe9..d9be84896 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -341,6 +341,7 @@ class wsDocument extends cubeMetier {
 		foreach ($pages as $i) {
 			$this->processOnePage($i);
 		}
+		$this->optimizeSVG();
 	}
 
 	public function getLinksAndTexts() {
@@ -572,13 +573,25 @@ class wsDocument extends cubeMetier {
 		$svgFile = $this->out . '/html/p' . $page . '.svg';
 		$svgOpt = $this->out . '/html/o' . $page . '.svg';
 
-		$pdf2svg = new cubeCommandLine('pdf2svg');
-		$pdf2svg->setPath(CONVERTER_PATH);
-		$pdf2svg->setArg(null, $this->cropped);
-		$pdf2svg->setArg(null, $svgFile);
-		$pdf2svg->setArg(null, $page);
-		$pdf2svg->execute();
-		$this->addToLog($pdf2svg, true, $page);
+		/* $pdf2svg = new cubeCommandLine('pdf2svg');
+		  $pdf2svg->setPath(CONVERTER_PATH);
+		  $pdf2svg->setArg(null, $this->cropped);
+		  $pdf2svg->setArg(null, $svgFile);
+		  $pdf2svg->setArg(null, $page);
+		  $pdf2svg->execute();
+		  $this->addToLog($pdf2svg, true, $page); */
+
+		$pdftocairo = new cubeCommandLine('pdftocairo');
+		$pdftocairo->setPath(CONVERTER_PATH);
+		$pdftocairo->setArg('f', $page);
+		$pdftocairo->setArg('l', $page);
+		$pdftocairo->setArg(null, '-svg');
+		$pdftocairo->setArg(null, '-cropbox');
+		$pdftocairo->setArg(null, $this->cropped);
+		$pdftocairo->setArg(null, $svgFile);
+		$pdftocairo->execute();
+		$this->addToLog($pdftocairo, true, $page);
+
 
 		$svg = new DOMDocument();
 		$svg->preserveWhiteSpace = false;