Changeset 31636 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2017-04-21T21:09:08+12:00 (7 years ago)

Author:

ak19

Message:

First phase of shifting gli code to use SafeProcess instead of Java Process. This phase takes care of all the easy cases.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -60 +60 @@
 import org.greenstone.gatherer.util.GS3ServerThread;
 import org.greenstone.gatherer.util.JarTools;
+import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -1433 +1434 @@
 
     
-    /** This private class contains an instance of an external application running within a JVM shell. It is important that this process sits in its own thread, but its more important that when we exit the Gatherer we don't actually System.exit(0) the Gatherer object until the user has volunteerily ended all of these child processes. Otherwise when we quit the Gatherer any changes the users may have made in external programs will be lost and the child processes are automatically deallocated. */
+    /** This private class contains an instance of an external application running within a JVM shell. It is important that this process sits in its own thread, but its more important that when we exit the Gatherer we don't actually System.exit(0) the Gatherer object until the user has voluntarily ended all of these child processes. Otherwise when we quit the Gatherer any changes the users may have made in external programs will be lost and the child processes are automatically deallocated. */
     static private class ExternalApplication
     extends Thread {
@@ -1629 +1630 @@
             boolean found = false;
 
-            try {
+            
                 // run the command `/path/to/perl -S gs-magick.pl identify -version`
                 ArrayList cmd_list = new ArrayList();
@@ -1656 +1657 @@
                 }
                 DebugStream.println("***** Running ImageMagickTest command: " + cmd_str);
-
-                Process image_magick_process = Runtime.getRuntime().exec(command_parts);
-                image_magick_process.waitFor();
-
-                //new way of detection of ImageMagick
-                InputStreamReader isr = new InputStreamReader(image_magick_process.getInputStream());
-
-                BufferedReader br = new BufferedReader(isr);
-                // Capture the standard output stream and seach for two particular occurrences: Version and ImageMagick.
-
-                String line = br.readLine();
-                if (line != null) {
-                    String lc_line = line.toLowerCase();
-                    if (lc_line.indexOf("version") != -1 || lc_line.indexOf("imagemagick") != -1) {
-                    //System.err.println("*** ImageMagickTest Line: " + line);
-                    found = true;
-                    } // else found var remains false
-                }
-
-                // Maybe put the close in a finally (but note that it can throw and IOex too)? See
-                // http://download.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html
-                br.close();
-                return found;
-                //return (image_magick_process.exitValue() == 0);
-            }
-            catch (Exception exception) {   
-                exception.printStackTrace();
+                System.err.println("***** Running ImageMagickTest command: " + cmd_str);
+               
+                SafeProcess image_magick_process = new SafeProcess(command_parts);
+                int exitValue = image_magick_process.runProcess(); // default process iostream handling
+                //new way of detection of ImageMagick
+                // Inspect the standard output of the process and seach for two particular occurrences: Version and ImageMagick.
+                String output = image_magick_process.getStdOutput().toLowerCase();
+                if (output.indexOf("version") != -1 || output.indexOf("imagemagick") != -1) {
+                System.err.println("*** ImageMagickTest output: " + output);
+                found = true;
+                } // else found var remains false   
+                
                 return found;
-            }
+                //return (image_magick_process.exitValue() == 0);
+                
         }
     }
@@ -1702 +1689 @@
         {
             try {
-                Process perl_process = Runtime.getRuntime().exec(command);
-                perl_process.waitFor();
-                return (perl_process.exitValue() == 0);
+                SafeProcess perl_process = new SafeProcess(command);
+                int exitValue = perl_process.runBasicProcess();
+                return (exitValue == 0);
             }
             catch (Exception exception) {