From 3833708dba5209a78f734c096bf0391f3df2a400 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Sun, 6 Mar 2011 11:54:09 +0000 Subject: [PATCH] --- inc/config.inc.php | 2 +- inc/ws/Metier/class.ws.document.php | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/inc/config.inc.php b/inc/config.inc.php index 3c838ea4c..b89892959 100644 --- a/inc/config.inc.php +++ b/inc/config.inc.php @@ -16,7 +16,6 @@ define('MONITOR_PERFS', true); define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player'); define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws'); - // Workshop define('THEMES', WEBROOT . '/fluidbook/themes/'); define('ICONS', WEBROOT . '/fluidbook/icones/'); @@ -29,6 +28,7 @@ define('WS_THEMES', WS_FILES . '/themes'); define('WS_CACHE', WS_FILES . '/cache'); define('WS_COMPILE_ASSETS', WS_FILES . '/compile'); define('WS_SOUNDS', WS_FILES . '/sounds'); +define('WS_TOOLS', WS_FILES . '/tools'); define('WORKER_PREFIX', 'worker.'); diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index de7c5cbba..605cb94c0 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -97,12 +97,24 @@ class wsDocument extends cubeMetier { mkdir($out, 0777, true); } - $pdfextract = new cubeCommandLine('pdfextract'); + /*$pdfextract = new cubeCommandLine('pdfextract'); $pdfextract->cd($out); $pdfextract->setPath(CONVERTER_PATH); - $pdfextract->setArg(null,$this->cropped); + $pdfextract->setArg(null, $this->cropped); $pdfextract->execute(); - $this->addToLog($pdfextract); + $this->addToLog($pdfextract);*/ + + $gs = new cubeCommandLine('gs'); + $gs->cd($out); + $gs->setArg('-dBATCH'); + $gs->setArg('-dNOPAUSE'); + $gs->setArg('-dNOPROMPT'); + $gs->setArg('-dNODISPLAY'); + $gs->setArg(null, WS_TOOLS.'/extractFonts.ps'); + $gs->setManualArg('-c "(' . $this->cropped . ') extractFonts quit"'); + + $gs->execute(); + $this->addToLog($gs); } public function getInfos($in = null, $force = false) -- 2.39.5