Changeset 31636 for main/trunk/gli/src/org/greenstone/gatherer/greenstone/Plugins.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/greenstone/Plugins.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/greenstone/Plugins.java

@@ -37 +37 @@
 import org.greenstone.gatherer.cdm.Plugin;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
+import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -160 +161 @@
         args.add(Configuration.getLanguage());
         args.add(plugin.getName());
-        // Run the pluginfo.pl process
-        Runtime runtime = Runtime.getRuntime();
-        Process process = runtime.exec((String[]) args.toArray(new String[] { }));
-        InputStream input_stream = process.getErrorStream();
-        StringBuffer pluginfo_xml_buffer = XMLTools.readXMLStream(input_stream);
-        if (pluginfo_xml_buffer != null) {
-            pluginfo_xml = pluginfo_xml_buffer.toString();
-        }
+
+        // Run the pluginfo.pl process:
+        // Create the process.
+        SafeProcess process = new SafeProcess((String[]) args.toArray(new String[] { }));
+
+        // run the SafeProcess
+        int exitVal = process.runProcess();
+        if(exitVal != 0) {
+            throw new Exception("*** Error running pluginfo.pl loadPlugInfo, process exited with: "
+                    + exitVal);
+        }
+        // get the result: We expect XML to have come out of the process std error stream.
+        pluginfo_xml = process.getStdError();
+        ///System.err.println("*********\nPluginInfo, got:\n" + pluginfo_xml + "\n**********\n");
         }
 
@@ -230 +237 @@
         args.add("-xml");
 
-        // Run the pluginfo.pl process
-        Runtime runtime = Runtime.getRuntime();
-        Process process = runtime.exec((String[]) args.toArray(new String[] { }));
-        InputStream input_stream = process.getErrorStream();
-        xml = XMLTools.readXMLStream(input_stream);
+        // Run the pluginfo.pl process:
+        // Create the process.
+        SafeProcess process = new SafeProcess((String[]) args.toArray(new String[] { }));
+
+        // run the SafeProcess
+        int exitVal = process.runProcess();
+        if(exitVal != 0) {
+            throw new Exception("*** Error running pluginfo.pl loadPluginsList, process exited with: "
+                    + exitVal);
+        }
+        // get the result: We expect XML to have come out of the process std error stream.
+        xml = new StringBuffer(process.getStdError());
+        ///System.err.println("*********\nPluginsList, got:\n" + xml + "\n**********\n");
         }