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

Timestamp:

2007-05-24T16:31:21+12:00 (17 years ago)

Author:

xiao

Message:

Instead of using the exitValue, now it uses the standard output phrase to detect the installation of ImageMagick

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

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

@@ -972 +972 @@
         Process image_magick_process = Runtime.getRuntime().exec(command);
         image_magick_process.waitFor();
-        return (image_magick_process.exitValue() == 0);
+        
+        //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 occurances: Version and ImageMagick.
+            String line = br.readLine().toLowerCase();
+        if (line.indexOf("version") != -1 || line.indexOf("imagemagick") != -1) {
+            return true;
+        } else {
+                return false;
+        }
+        //return (image_magick_process.exitValue() == 0);
         }
         catch (IOException exception) {