Changeset 31636 for main/trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

Timestamp:

2017-04-21T21:09:08+12:00 (7 years ago)

Author:

ak19

Message:

First phase of shifting gli code to use SafeProcess instead of Java Process. This phase takes care of all the easy cases.

File:

• main/trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -11 +11 @@
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Codec;
+import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
@@ -238 +239 @@
         args[5] = lang;
 
-
         // Create the process.
-        Runtime runtime = Runtime.getRuntime();
-        Process process = runtime.exec(args);
-
-        
+        SafeProcess process = new SafeProcess(args);
+
         //for (int i=0; i<args.length; i++) { 
         //   System.err.print(args[i] + " ");
@@ -249 +247 @@
         //System.err.println("");
         
-
-
-        document = XMLTools.parseXML(process.getErrorStream());
+        // run the SafeProcess
+        int exitVal = process.runProcess();
+        if(exitVal != 0) {
+            throw new Exception("*** Error running ScriptOptions process, process exited with: "
+                    + exitVal);
+        }       
         
+        // get the result and process it.
+        // We expect XML to have come out of the process std error stream.
+        String errStreamOutput = process.getStdError();
+        ///System.err.println("*********\nScriptOptions data, got:\n" + errStreamOutput + "\n**********\n");
+        StringReader xmlStrReader = new StringReader(errStreamOutput);
+        document = XMLTools.parseXML(xmlStrReader);
+        xmlStrReader.close();
+
+
         if (document == null) {
             // command has not generated XML, script has probably failed in some way