Changeset 9677

Timestamp:

2005-04-14T13:53:14+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now output from exploding metadata databases is displayed correctly.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/ExplodeMetadataPrompt.java (modified) (3 diffs)
• shell/GShell.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataPrompt.java

@@ -156 +156 @@
     public synchronized void message(GShellEvent event) {
     String message = event.getMessage();
-    if (message.startsWith("other>")) {
+    if (message.startsWith("explode_metadata_database.pl>")) {
         message = message.substring(6);
         error_message.append(message);
@@ -253 +253 @@
 
     this.error_message = new StringBuffer();
-    GShell process = new GShell(args, GShell.OTHER, 3, this, null, GShell.GSHELL_OTHER);
+    GShell process = new GShell(args, GShell.EXPLODE, 3, this, null, GShell.GSHELL_EXPLODE);
     //process.start();
     process.run();
@@ -263 +263 @@
     }
 
-    private void resultPrompt(boolean success, String message) {
-    
-    String title;
-    String label;
+    private void resultPrompt(boolean success, String message)
+    {
     if (success) {
-        title = Dictionary.get("ExplodeMetadataPrompt.Successful_Title");
-        label = Dictionary.get("ExplodeMetadataPrompt.Successful_Explode", metadata_file.getName());
-    } else {
-        title = Dictionary.get("ExplodeMetadataPrompt.Failed_Title");
-        label = Dictionary.get("ExplodeMetadataPrompt.Failed_Explode", metadata_file.getName());
-    }
-    SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, message);
-    result_dialog.setVisible(true); // Blocks
-    result_dialog.dispose();
-    result_dialog = null;
-
-    }
+        // !!! TO DO: Get explode_metadata_database.pl strings translated and use SimpleResultDialog below
+        JOptionPane.showMessageDialog(null, Dictionary.get("ExplodeMetadataPrompt.Successful_Explode", metadata_file.getName()), Dictionary.get("ExplodeMetadataPrompt.Successful_Title"), JOptionPane.INFORMATION_MESSAGE);
+    }
+    else {
+        String title = Dictionary.get("ExplodeMetadataPrompt.Failed_Title");
+        String label = Dictionary.get("ExplodeMetadataPrompt.Failed_Explode", metadata_file.getName());
+        SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, message);
+        result_dialog.setVisible(true); // Blocks
+        result_dialog.dispose();
+        result_dialog = null;
+    }
+    }
+
     private class CancelListener
     implements ActionListener {

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -77 +77 @@
     /** Arguments to be given to the process (including the executable you are calling. */
     private String args[] = null;
-    /** Element in process type enumeration. */
+    /** Elements in process type enumeration. */
     static final public int BUILD = 0;
-    /** Element in process type enumeration. */
     static final public int IMPORT = 1;
-    /** Element in process type enumeration. */
     static final public int NEW = 2;
-    /** Element in process type enumeration. */
     static final public int EXPORTAS = 3;
-    /** Element in process type enumeration. */
     static final public int CDIMAGE = 4;
-    /** Element in process type enumeration. */
     static final public int CONVERT = 5;
-    /** Element in process type enumeration. */
-    static final public int OTHER = 6;
-    /** Element in status type enumeration. */
+    static final public int EXPLODE = 6;
+
+    /** Elements in status type enumeration. */
     static final public int ERROR = 0;
-    /** Element in status type enumeration. */
     static final public int OK = 1;
     static final public int CANCELLED = 2;
-    /** Element in process type name enumeration. */
+
+    /** Elements in process type name enumeration. */
     static public String GSHELL_BUILD = "gshell_build";
-    /** Element in process type name enumeration. */
     static public String GSHELL_IMPORT = "gshell_import";
-    /** Element in process type name enumeration. */
     static public String GSHELL_NEW = "gshell_new";
-    /** Element in process type name enumeration */
     static public String GSHELL_EXPORTAS = "gshell_exportas";
-    /** Element in process type name enumeration */
     static public String GSHELL_CDIMAGE = "gshell_cdimage";
-    /** Element in process type name enumeration */
     static public String GSHELL_CONVERT = "gshell_convert";
-    /** Element in process type name enumeration */
-    static public String GSHELL_OTHER = "gshell_other";
+    static public String GSHELL_EXPLODE = "gshell_explode";
 
     /** Determine if the given process is still executing. It does this by attempting to throw an exception - not the most efficient way, but the only one as far as I know
@@ -767 +756 @@
         name = "convert_coll_from_gs2.pl";
         break;
+    case EXPLODE:
+        name = "explode_metadata_database.pl";
+        break;
     default:
         name = "";