[Fusionforge-commits] FusionForge branch master updated. 38f4025ac01d2b759dae5df97cf7779f5bc7aa33

Franck Villaume nerville at fusionforge.org
Sun Dec 7 19:05:12 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  38f4025ac01d2b759dae5df97cf7779f5bc7aa33 (commit)
      from  70e8d4f732b1c4ae5a459aa75dcb7eeb160bd046 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 38f4025ac01d2b759dae5df97cf7779f5bc7aa33
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Dec 7 19:04:42 2014 +0100

    docman: fix correct parser call

diff --git a/src/common/docman/engine/parser_unoconv_document.php b/src/common/docman/engine/parser_unoconv_document.php
index 45d4b1e..802e453 100644
--- a/src/common/docman/engine/parser_unoconv_document.php
+++ b/src/common/docman/engine/parser_unoconv_document.php
@@ -43,7 +43,7 @@ $cmd = "/usr/bin/unoconv -d document -f text -o $fichout $fichin";
 $res = shell_exec($cmd);
 
 echo parser_text($fichout);
-unlink ($fichout);
+unlink($fichout);
 
 // Local Variables:
 // mode: php
diff --git a/src/common/docman/engine/parser_unoconv_presentation.php b/src/common/docman/engine/parser_unoconv_presentation.php
index d2d0ba7..0736f8e 100644
--- a/src/common/docman/engine/parser_unoconv_presentation.php
+++ b/src/common/docman/engine/parser_unoconv_presentation.php
@@ -5,7 +5,7 @@
  *
  * Copyright 2005, Fabio Bertagnin
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2014 Franck Villaume - TrivialDev
  * Copyright 2014, Roland Mas
  * http://fusionforge.org
  *
@@ -27,7 +27,7 @@
 
 require dirname(__FILE__).'/../../include/env.inc.php';
 
-require_once $gfcommon.'docman/engine/parser_text.inc.php';
+require_once $gfcommon.'docman/engine/parser_pdf.inc.php';
 
 if ($argc != 2) {
 	echo 'Usage : parser_unoconv_document.php <filename>'."\n";
@@ -43,7 +43,7 @@ $cmd = "/usr/bin/unoconv -d presentation -f pdf -o $fichout $fichin";
 $res = shell_exec($cmd);
 
 echo parser_pdf($fichout);
-unlink ($fichout);
+unlink($fichout);
 
 // Local Variables:
 // mode: php
diff --git a/src/common/docman/engine/parser_unoconv_spreadsheet.php b/src/common/docman/engine/parser_unoconv_spreadsheet.php
index b69918f..4752885 100644
--- a/src/common/docman/engine/parser_unoconv_spreadsheet.php
+++ b/src/common/docman/engine/parser_unoconv_spreadsheet.php
@@ -5,7 +5,7 @@
  *
  * Copyright 2005, Fabio Bertagnin
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2014 Franck Villaume - TrivialDev
  * Copyright 2014, Roland Mas
  * http://fusionforge.org
  *
@@ -27,7 +27,7 @@
 
 require dirname(__FILE__).'/../../include/env.inc.php';
 
-require_once $gfcommon.'docman/engine/parser_text.inc.php';
+require_once $gfcommon.'docman/engine/parser_pdf.inc.php';
 
 if ($argc != 2) {
 	echo 'Usage : parser_unoconv_document.php <filename>'."\n";
@@ -43,7 +43,7 @@ $cmd = "/usr/bin/unoconv -d spreadsheet -f pdf -o $fichout $fichin";
 $res = shell_exec($cmd);
 
 echo parser_pdf($fichout);
-unlink ($fichout);
+unlink($fichout);
 
 // Local Variables:
 // mode: php

-----------------------------------------------------------------------

Summary of changes:
 src/common/docman/engine/parser_unoconv_document.php     |    2 +-
 src/common/docman/engine/parser_unoconv_presentation.php |    6 +++---
 src/common/docman/engine/parser_unoconv_spreadsheet.php  |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list