Changeset 31665 for main/trunk/greenstone3/src/java/org/greenstone/util/BrowserLauncher.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/BrowserLauncher.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import org.greenstone.server.BaseProperty;
 import org.greenstone.util.Misc;
+import org.greenstone.util.SafeProcess;
 import org.apache.log4j.*;
 
@@ -50 +51 @@
          // we try to look for a browser
         for (int i=0; i<default_browsers.length; i++) {
-        if (isAvailable(default_browsers[i])) {
+        if (SafeProcess.isAvailable(default_browsers[i])) {
             this.command = default_browsers[i] + " %1";
             break;
@@ -60 +61 @@
     }
 
+    // Replaced by SafeProcess.isAvailable(program)
+    /*
     protected boolean isAvailable(String program) {
     try {
@@ -76 +79 @@
         return false;
     }
-    }
+    }*/
 
     public  int getBrowserState(){
@@ -100 +103 @@
         logger.info(new_command);
         Runtime rt = Runtime.getRuntime();
-        Process process = rt.exec(new_command);
+        //Process process = rt.exec(new_command);
                 state = LAUNCHSUCCESS;
-        exitCode = process.waitFor();
+        //exitCode = process.waitFor();
+        SafeProcess process = new SafeProcess(new_command);
+        exitCode = process.runProcess();
+        process = null;
         logger.info("ExitCode:" + exitCode);              
         if (exitCode != 0) { // if Netscape or mozilla was not open
             logger.info("couldn't do remote, trying original command");
                     logger.info(this.command);
-            process = rt.exec(this.command); // try the original command
+            //process = rt.exec(this.command); // try the original command
                     state = LAUNCHSUCCESS;
             //for some reason the following part is not executed sometimes.
-                    exitCode = process.waitFor();
+                    //exitCode = process.waitFor();
+            process = new SafeProcess(this.command);
+            exitCode = process.runProcess();
+            process = null;
         }
         } else {
         logger.info(this.command);
                 Runtime rt = Runtime.getRuntime();
-        Process process = rt.exec(this.command);
+        //Process process = rt.exec(this.command);
                 state = LAUNCHSUCCESS;
                 //for some reason the following part is not executed sometimes.
-                exitCode = process.waitFor();
+                //exitCode = process.waitFor();
+        SafeProcess process = new SafeProcess(this.command);
+        exitCode = process.runProcess();
         }