[evolvis-commits] r16960: port fix from trunk: docman parser

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Mar 1 01:53:37 CET 2011


Author: mirabilos
Date: 2011-03-01 01:53:36 +0100 (Tue, 01 Mar 2011)
New Revision: 16960

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_doc.php
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_html.php
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_list.txt
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_oo.php
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_pdf.php
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.inc.php
   trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.php
Log:
port fix from trunk: docman parser

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_doc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_doc.php	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_doc.php	2011-03-01 00:53:36 UTC (rev 16960)
@@ -4,6 +4,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
+ * Copyright 2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -24,11 +25,10 @@
  * USA
  */
 
-require dirname(__FILE__).'/../../../www/env.inc.php';
+require dirname(__FILE__).'/../../include/env.inc.php';
 
 require_once $gfcommon.'docman/engine/parser_text.inc.php';
 
-
 if ($argc != 2) {
 	echo "Usage : parser_doc.php <filename>\n";
 	exit (1);
@@ -38,7 +38,7 @@
 if (!is_file($fichin))
 	exit (1);
 
-$fichout = tempnam("/tmp/","tmp");
+$fichout = tempnam(forge_get_config('data_path'), "tmp");
 $cmd = "/usr/bin/antiword -i1 -t $fichin > $fichout";
 $res = shell_exec($cmd);
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_html.php	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_html.php	2011-03-01 00:53:36 UTC (rev 16960)
@@ -4,7 +4,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
- * Copyright 2009-2010, Franck Villaume
+ * Copyright 2009-2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -25,7 +25,7 @@
  * USA
  */
 
-require dirname(__FILE__).'/../../../www/env.inc.php';
+require dirname(__FILE__).'/../../include/env.inc.php';
 
 require_once $gfcommon.'docman/engine/parser_text.inc.php';
 
@@ -43,7 +43,7 @@
 fclose($fd);
 
 $strip_content = strip_tags($contents);
-$filename = tempnam("/tmp", "tmp");
+$filename = tempnam(forge_get_config('data_path'), "tmp");
 $fd = fopen($filename, "w");
 fwrite($fd , $strip_content);
 fclose($fd);

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_list.txt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_list.txt	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_list.txt	2011-03-01 00:53:36 UTC (rev 16960)
@@ -3,7 +3,7 @@
 # FusionForge document search engine
 #
 # Copyright 2005, Fabio Bertagnin
-# Copyright 2009-2010, Franck Villaume
+# Copyright 2009-2010, Franck Villaume - Capgemini
 # http://fusionforge.org
 #
 # This file is part of FusionForge.

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_oo.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_oo.php	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_oo.php	2011-03-01 00:53:36 UTC (rev 16960)
@@ -3,7 +3,7 @@
 /**
  * FusionForge document search engine
  *
- * Copyright 2010, Franck Villaume
+ * Copyright 2010-2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -24,28 +24,27 @@
  * USA
  */
 
-require dirname(__FILE__).'/../../../www/env.inc.php';
+require dirname(__FILE__).'/../../include/env.inc.php';
 
 require_once $gfcommon.'docman/engine/parser_text.inc.php';
 
-
 if ($argc != 2) {
 	echo "Usage : parser_oo.php <filename>\n";
-	exit (1);
+	exit(1);
 }
 
 $fichin = $argv[1];
 if (!is_file($fichin))
-	exit (1);
+	exit(1);
 
 $zip = new ZipArchive;
 if ($zip->open($fichin) === TRUE) {
-	$output_dir = $fichin.".dir";
+	$output_dir = tempnam(forge_get_config('data_path'), "tmp");
 	mkdir($output_dir);
 	$zip->extractTo($output_dir, array('content.xml'));
 	$zip->close();
 } else {
-	exit (2);
+	exit(2);
 }
 
 // transformer le context.xml en fichier txt

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_pdf.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_pdf.php	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_pdf.php	2011-03-01 00:53:36 UTC (rev 16960)
@@ -4,7 +4,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
- * Copyright 2009-2010, Franck Villaume
+ * Copyright 2009-2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -25,7 +25,7 @@
  * USA
  */
 
-require dirname(__FILE__).'/../../../www/env.inc.php';
+require dirname(__FILE__).'/../../include/env.inc.php';
 
 require_once $gfcommon.'docman/engine/parser_text.inc.php';
 
@@ -39,7 +39,7 @@
 if (!is_file($fichin))
 	exit (1);
 
-$fichout = tempnam("/tmp","tmp");
+$fichout = tempnam(forge_get_config('data_path'),"tmp");
 $cmd = "/usr/bin/pdftotext $fichin $fichout";
 $res = shell_exec($cmd);
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.inc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.inc.php	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.inc.php	2011-03-01 00:53:36 UTC (rev 16960)
@@ -3,6 +3,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
+ * Copyright 2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -23,17 +24,19 @@
  * USA
  */
 
+require_once $gfcommon.'include/config.php';
+
 function parser_text($fichin) {
 	$tstart = microtime_float();
 	if (!is_file($fichin))
 		return "";
 
-	$fp = fopen ($fichin, "r");
-	$buff = fread ($fp, filesize($fichin));
+	$fp = fopen($fichin, "r");
+	$buff = fread($fp, filesize($fichin));
 	// tout en minuscules
 	$buff = mb_strtolower($buff);
 	// élimination d'éventuels caractères unicode encore présents
-	$buff = mb_convert_encoding ($buff, "ascii");
+	$buff = mb_convert_encoding($buff, "ascii");
 	// élimination caractères avec accents 
 	// et caractères spéciaux
 	$buff = suppression_diacritics($buff);

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.php	2011-03-01 00:53:34 UTC (rev 16959)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/docman/engine/parser_text.php	2011-03-01 00:53:36 UTC (rev 16960)
@@ -4,7 +4,7 @@
  * FusionForge document search engine
  *
  * Copyright 2005, Fabio Bertagnin
- * Copyright 2009-2010, Franck Villaume
+ * Copyright 2009-2011, Franck Villaume - Capgemini
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -25,7 +25,7 @@
  * USA
  */
 
-require dirname(__FILE__).'/../../../www/env.inc.php';
+require dirname(__FILE__).'/../../include/env.inc.php';
 
 require_once $gfcommon.'docman/engine/parser_text.inc.php';
 



More information about the evolvis-commits mailing list