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

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

@@ -3 +3 @@
 import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.Closeable;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -28 +29 @@
      try {
          state = -1;
-         Runtime run = Runtime.getRuntime();
-
          String targetCmd = getTargetCmd();
          logger.info("Target: " + targetCmd);
 
+         /*
+         Runtime run = Runtime.getRuntime();
              Process process = run.exec(targetCmd);
          BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
@@ -55 +56 @@
          
          br.close();
+         */
+         
+         
+         SafeProcess process = new SafeProcess(targetCmd);
+         process.setSplitStdOutputNewLines(true);
+         process.runProcess();       
+         String output = process.getStdOutput();
+         String[] lines = output.split("[\\r\\n]+"); // http://stackoverflow.com/questions/454908/split-java-string-by-new-line
+         for(int i = 0; i < lines.length; i++) {
+         //System.err.println("*** Got line:|" + lines[i] + "|***");
+         String line = lines[i].trim();
+         if (line.equals(targetSuccess)){
+             state = 0;
+         }
+         
+         if (line.equals(targetFailed)){
+             state = 1; 
+         }
 
+         if(line.startsWith(targetFinished)){
+             break;      
+         }
+         }
+         //System.err.println("\n\n");
+
+         
          if(state < 0) {
          logger.info("Unexpected end of input when running target: " + targetCmd);