Changeset 31585 for main

Timestamp:

2017-04-06T21:03:08+12:00 (7 years ago)

Author:

ak19

Message:

GLI's DownloadPane.java now also uses SafeProcess.java when running a perl process from Java.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• gui/DownloadPane.java (modified) (3 diffs)
• util/SafeProcess.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -240 +240 @@
     private ArrayList<String> loadDownloadersInfo(String lang) {
     Document document = null;
-    Process process = null;
     
     try {
@@ -267 +266 @@
         // Create the process.
         args = (String []) args_list.toArray(new String[0]);
-        Runtime runtime = Runtime.getRuntime();
+
+        SafeProcess process = new SafeProcess(args);
         DebugStream.println("Getting Download Info: "+args_list);
-        process = runtime.exec(args);
-        
-        InputStream input_stream = process.getErrorStream();
-        document = XMLTools.parseXML(input_stream);
+
+        // run the SafeProcess
+        int exitVal = process.runProcess();
+        if(exitVal != 0) {
+            throw new Exception("*** Error running Download Info process, process exited with: "
+                    + exitVal);
+        }       
+        
+        // get the result and process it.
+        // This time we expect XML to have come out of the process std error stream.
+        String errStreamOutput = process.getStdError();
+        StringReader xmlStrReader = new StringReader(errStreamOutput);
+        document = XMLTools.parseXML(xmlStrReader);
+        xmlStrReader.close();
+        
         }
 
@@ -280 +291 @@
         System.err.println("Failed when trying to parse downloadinfo.pl -describeall");
         error.printStackTrace();
-    } 
-    finally {
-        SafeProcess.closeProcess(process);
     }
 

main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java

@@ -23 +23 @@
     //static Logger logger = Logger.getLogger(org.greenstone.util.SafeProcess.class.getName());
 
+    // input to SafeProcess and initialising it
     private String command = null;
     private String[] command_args = null;
@@ -29 +30 @@
     private String inputStr = null;
 
+    // output from running SafeProcess.runProcess()
     private String outputStr = ""; 
     private String errorStr = "";
-
     private int exitValue = -1;
 
@@ -52 +53 @@
     }
 
+    // cmd string version
     public SafeProcess(String cmdStr)
     {