Merged in from STABLE trunk...

KTS-3232 "Uno module appears to require editing document conversion scripts" Fixed. Allow ooProgramPath to be set as an environment variable. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@8842 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from STABLE trunk...
KTS-3232 "Uno module appears to require editing document conversion scripts" Fixed. Allow ooProgramPath to be set as an environment variable. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@8842 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent ac46000f
Showing 2 changed files with 25 additions and 6 deletions
bin/openoffice/DocumentConverter.py
search2/indexing/extractorCore.inc.php
@@ -11,6 +11,15 @@
 #DEFAULT_OPENOFFICE_PORT = 8100
+import sys
+import os
+
+ooProgramPath = os.environ.get('ooProgramPath')
+if ooProgramPath is None:
+    ooProgramPath = "/usr/lib64/ooo-2.0/program"
+
+sys.path.append(ooProgramPath)
+
 import uno
 from os.path import abspath, splitext
 from com.sun.star.beans import PropertyValue
@@ -79,7 +88,7 @@ def _unoProps(**args):
 class DocumentConverter:
-    
+
     def __init__(self, host, port):
         localContext = uno.getComponentContext()
         resolver = localContext.ServiceManager.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", localContext)
@@ -97,7 +106,7 @@ class DocumentConverter:
         inputUrl = self._fileUrl(argv[1])
         outputUrl = self._fileUrl(argv[2])
-        
+
         document = self.desktop.loadComponentFromURL(inputUrl, "_blank", 0, _unoProps(Hidden=True, ReadOnly=True))
         document.storeToURL(outputUrl, _unoProps(FilterName=filterName))
         document.close(True)
@@ -120,20 +129,20 @@ class DocumentConverter:
         ext = splitext(path)[1]
         if ext is not None:
             return ext[1:].lower()
-    
+
     def _fileUrl(self, path):
         return uno.systemPathToFileUrl(abspath(path))
 if __name__ == "__main__":
     from sys import argv, exit
-    
+
     if len(argv) < 3:
         print "USAGE: " + argv[0] + " <input-file> <output-file> <host> <port>"
         exit(255)
     try:
-        converter = DocumentConverter(argv[3],argv[4])    
+        converter = DocumentConverter(argv[3],argv[4])
         converter.convert(argv[1], argv[2])
     except DocumentConversionException, exception:
         print "ERROR! " + str(exception)
@@ -339,6 +339,8 @@ abstract class DocumentExtractor
  */
 abstract class ExternalDocumentExtractor extends DocumentExtractor
 {
+    protected $allowOutput = false;
+
 	/**
 	 * Initialise the extractor.
 	 *
@@ -347,6 +349,14 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor
 	{
 		parent::__construct();
 		putenv('LANG=en_US.UTF-8');
+
+		$config = KTConfig::getSingleton();
+		putenv('ooProgramPath=' . $config->get('openoffice/ProgramPath', '/usr/lib64/ooo-2.0/program2'));
+	}
+
+	public function setAllowOutput($allowOutput)
+	{
+	    $this->allowOutput = $allowOutput;
 	}
 	/**
@@ -419,7 +429,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor
 			@unlink($script_out);
 		}
-		return ($res == 0) && empty($this->output);
+		return ($res == 0) && (empty($this->output) || $this->allowOutput);
 	}
 	/**