Changeset 31665 for main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

Timestamp:

2017-05-08T21:18:21+12:00 (7 years ago)

Author:

ak19

Message:

GS3 source code now updated to use SafeProcess instead of Process (calling Runtime.exec() directly). The use of SafeProcess in RunTarget and BrowserLauncher has been tested on Linux. GDBMWrapper, MapRetrieve and admin/guiext's Command.java are not tested. For GDBMWrapper, because it's in a bit of code that works with txtgz databases. MapRetrive.java and Command.java are untested because I don't know how to test them.

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

@@ -33 +33 @@
 
 public class SafeProcess {
-    public static int DEBUG = 0;
+    public static int DEBUG = 1;
 
     public static final int STDERR = 0;
@@ -741 +741 @@
     SafeProcess prcs = new SafeProcess("which " + program);     
     prcs.runProcess();
-    String output = prcs.getStdOutput();
+    String output = prcs.getStdOutput().trim(); 
+    ///System.err.println("*** 'which " + program + "' returned: |" + output + "|");
     if(output.equals("")) {
+        return false;
+    } else if(output.indexOf("no "+program) !=-1) { // from GS3's org.greenstone.util.BrowserLauncher.java's isAvailable(program)
+        log("@@@ SafeProcess.isAvailable(): " + program + "is not available");
         return false;
     }
@@ -1010 +1014 @@
     logger.info(msg);
 
-    //System.err.println(msg);
+    System.err.println(msg);
 
     //DebugStream.println(msg);
@@ -1019 +1023 @@
     logger.error(msg, e);
 
-    //System.err.println(msg);
-    //e.printStackTrace();
+    System.err.println(msg);
+    e.printStackTrace();
 
     //DebugStream.println(msg);
@@ -1030 +1034 @@
     logger.error(e);
 
-    //e.printStackTrace();
+    e.printStackTrace();
 
     //DebugStream.printStackTrace(e);