Changeset 9580

Timestamp:

2005-04-07T13:37:28+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a check for ImageMagick when the GLI starts up.

File:

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

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

@@ -214 +214 @@
         }
 
+        // Check for ImageMagick
+        if (Gatherer.isGsdlRemote) {
+        DebugStream.println("Not checking for ImageMagick.");
+        }
+        else if (!(new ImageMagickTest()).found()) {
+        // Time for a warning message
+        missingImageMagick();
+        }
+        
         if (Gatherer.isGsdlRemote) {
         DebugStream.println("Not checking for perl path/exe");
@@ -570 +579 @@
 
 
-    /** Prints a warning message about a missing GSDL path, which although not fatal pretty much ensures nothing will work properly in the Gatherer.
+    /** Prints a warning message about a missing GSDL path, which although not fatal pretty much ensures nothing will work properly in the GLI.
      */
     static public void missingGSDL() {
@@ -579 +588 @@
     }
 
-    /** Prints a warning message about a missing PERL path, which although not fatal pretty much ensures no collection creation/building will work properly in the Gatherer. */
+    /** Prints a warning message about missing a valid ImageMagick path, which although not fatal means building image collections won't work */
+    static public void missingImageMagick() {
+    WarningDialog dialog = new WarningDialog("warning.MissingImageMagick", "MissingImageMagick.Title", "MissingImageMagick.Message", null, false);
+    dialog.display();
+    dialog.dispose();
+    dialog = null;
+    }
+
+    /** Prints a warning message about missing a valid PERL path, which although not fatal pretty much ensures no collection creation/building will work properly in the GLI. */
     static public void missingPERL() {
     WarningDialog dialog = new WarningDialog("warning.MissingPERL", "MissingPERL.Title", "MissingPERL.Message", null, false);
@@ -587 +604 @@
     }
 
-    /** Prints a warning message about a missing a valid WGet path. not fatal, but mirroring won't work */
+    /** Prints a warning message about missing a valid WGet path, which although not fatal means mirroring won't work */
     static public void missingWGET() {
     WarningDialog dialog = new WarningDialog("warning.MissingWGET", "MissingWGET.Title", "MissingWGET.Message", null, false);
@@ -793 +810 @@
 
 
-    private class PerlTest {
-
+    private class ImageMagickTest
+    {
+    public boolean found()
+    {
+        try {
+        String command = (Utility.isWindows() ? "identify.exe" : "identify");
+        Process image_magick_process = Runtime.getRuntime().exec(command);
+        image_magick_process.waitFor();
+        return (image_magick_process.exitValue() == 0);
+        }
+        catch (Exception exception) {
+        return false;
+        }
+    }
+    }
+
+
+    private class PerlTest
+    {
     private String[] command = new String[2];
 
-    public PerlTest() {
-        if(Utility.isWindows()) {
-        command[0] = Utility.PERL_EXECUTABLE_WINDOWS;
-        }
-        else {
-        command[0] = Utility.PERL_EXECUTABLE_UNIX;
-        }
+    public PerlTest()
+    {
+        command[0] = (Utility.isWindows() ? Utility.PERL_EXECUTABLE_WINDOWS : Utility.PERL_EXECUTABLE_UNIX);
         command[1] = "-version";
     }
 
-    public boolean found() {
-        boolean found = false;
+    public boolean found()
+    {
         try {
-        Process prcs = Runtime.getRuntime().exec(command);
-        prcs.waitFor();
-        found = (prcs.exitValue() == 0);
-        prcs = null;
-        }
-        catch(Exception error) {
-        }
-        return found;
+        Process perl_process = Runtime.getRuntime().exec(command);
+        perl_process.waitFor();
+        return (perl_process.exitValue() == 0);
+        }
+        catch (Exception exception) {
+        return false;
+        }
     }