Changeset 9583

Timestamp:

2005-04-07T14:53:20+12:00 (19 years ago)

Author:

mdewsnip

Message:

ProcessingError events (during importing) can now have a reason ("r") attribute that explains why processing failed.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java (modified) (2 diffs)

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

@@ -85 +85 @@
     /** */
     static final private String PLUGIN_ATTRIBUTE = "p";
+    static final private String REASON_ATTRIBUTE = "r";
     /** The fixed portion of the progress bar used for the calculating of file size and other pre-import functions. */
     static final private int CALCULATION = 50000;
@@ -252 +253 @@
             String args[] = new String[1];
             args[0] = element.getAttribute(NAME_ATTRIBUTE);
-            queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Import.FileProcessingError", args), event.getStatus()));
+            String reason = element.getAttribute(REASON_ATTRIBUTE);
+            if (reason == null || reason.equals("")) {
+            queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Import.FileProcessingError", args), event.getStatus()));
+            }
+            else {
+            queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Import.FileProcessingError", args) + " (" + reason + ")", event.getStatus()));
+            }
             args = null;
         }