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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java

@@ -29 +29 @@
 import java.util.ArrayList;
 
+import org.greenstone.util.SafeProcess;
+
 /**
  * java wrapper class for gdbm - uses Java-GDBM written by Martin Pool replaces
@@ -113 +115 @@
                                 String cmdTest = "perl -v 2>&1";
                                 //String cmdTest = "echo %PATH%";
-                                int returnValue = Processing.runProcess(cmdTest);
+                                
+                                //int returnValue = Processing.runProcess(cmdTest);
+
+                                // replace Processing.java with SafeProcess.java
+                                // so retain the same behaviour (logging)
+                                SafeProcess process = new SafeProcess(cmdTest);
+                                logger.error("executing command "+cmdTest);
+                                int returnValue = process.runProcess();
+                                // do something with the messages
+                                logger.error("err>"+process.getStdError());
+                                logger.error("out>"+process.getStdOutput());
+                                process = null;
+                                
                                 if (returnValue != 0)
                                 {
@@ -122 +136 @@
 
                                 String cmd = "perl -S txtgz-to-gdbm.pl \"" + txtgzFilename + "\" \"" + filename + "\"";
-                                returnValue = Processing.runProcess(cmd);
+                                //returnValue = Processing.runProcess(cmd);
+
+                                // replace Processing.java with SafeProcess.java
+                                // so retain the same behaviour (logging)
+                                process = new SafeProcess(cmd);
+                                logger.error("executing command "+cmd);
+                                returnValue = process.runProcess();
+                                // do something with the messages
+                                logger.error("err>"+process.getStdError());
+                                logger.error("out>"+process.getStdOutput());
+                                process = null;
+
                                 // For some reason, launching this command with gsdl_system() still returns 1
                                 // even when it returns 0 when run from the command-line. We can check whether