(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 3c838ea4cb3b37d10bb5623c34399c07bbfbcbcd..b8989295900976425680bdb6eb0f15e8f202954e 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -16,7 +16,6 @@ define('MONITOR_PERFS', true);
 \r
 define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player');\r
 define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws');\r
-\r
 // Workshop\r
 define('THEMES', WEBROOT . '/fluidbook/themes/');\r
 define('ICONS', WEBROOT . '/fluidbook/icones/');\r
@@ -29,6 +28,7 @@ define('WS_THEMES', WS_FILES . '/themes');
 define('WS_CACHE', WS_FILES . '/cache');\r
 define('WS_COMPILE_ASSETS', WS_FILES . '/compile');\r
 define('WS_SOUNDS', WS_FILES . '/sounds');\r
+define('WS_TOOLS', WS_FILES . '/tools');\r
 \r
 define('WORKER_PREFIX', 'worker.');\r
 \r

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index de7c5cbba972bd8d570ff30de7760d747b57b480..605cb94c0fd7008bfad3f8bb80da20a3690e6483 100644 (file)
--- 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);\r
                }\r
 \r
-               $pdfextract = new cubeCommandLine('pdfextract');\r
+               /*$pdfextract = new cubeCommandLine('pdfextract');\r
                $pdfextract->cd($out);\r
                $pdfextract->setPath(CONVERTER_PATH);\r
-               $pdfextract->setArg(null,$this->cropped);\r
+               $pdfextract->setArg(null, $this->cropped);\r
                $pdfextract->execute();\r
-               $this->addToLog($pdfextract);\r
+               $this->addToLog($pdfextract);*/\r
+\r
+               $gs = new cubeCommandLine('gs');\r
+               $gs->cd($out);\r
+               $gs->setArg('-dBATCH');\r
+               $gs->setArg('-dNOPAUSE');\r
+               $gs->setArg('-dNOPROMPT');\r
+               $gs->setArg('-dNODISPLAY');\r
+               $gs->setArg(null, WS_TOOLS.'/extractFonts.ps');\r
+               $gs->setManualArg('-c "(' . $this->cropped . ') extractFonts quit"');\r
+\r
+               $gs->execute();\r
+               $this->addToLog($gs);\r
        }\r
 \r
        public function getInfos($in = null, $force = false)\r