Changeset 6539 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

2004-01-16T16:04:59+13:00 (20 years ago)

Author:

jmt12

Message:

Heres a bunch of other changed files. If it wasn't a Friday afternoon I might be bothered finding out what I actually changed in them. Such changes include: a new option or three on preferences, a bug fix for the GDM classes, several changes to CDM to allow for G2.39 configuration files, a fix to Codec to allow for quotes in format strings and more work on CommandTokenizer to allow for stupid, stupid, stupid collectionextra's starting with speech marks then a new line. Plus other stuff. And things. Peace Out.

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• GDMDocument.java (modified) (2 diffs)
• GreenstoneArchiveParser.java (modified) (1 diff)
• MSMPrompt.java (modified) (1 diff)
• parsers/GreenstoneMetadataParser.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java

@@ -258 +258 @@
     public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level, boolean purge) {
     Gatherer.println("Get metadata for " + filename);
+    Gatherer.println("remove = " + remove + ", metadata_so_far = " + (metadatum_so_far != null ? String.valueOf(metadatum_so_far.size()) : "null") + ", file = " + file + ", append_folder_level = " + append_folder_level + ", purge = " + purge);
     // Of course null is not an acceptable filename
-    if(filename == null) {
-        return metadatum_so_far;
-    }
-    Gatherer.println("append_folder_level: " + append_folder_level);
-    Gatherer.println("purge: " + purge);
+    //if(filename == null) {
+    //    return metadatum_so_far;
+    //}
     ArrayList metadatum = null;
     ArrayList queued_for_removal = new ArrayList();
@@ -409 +408 @@
 
                 // Now we remove any elements that have been queued for deletion
-                for(int a = 0; a < queued_for_removal.size(); a++) {
+                for(int a = 0; queued_for_removal != null && a < queued_for_removal.size(); a++) {
                 Element metadata_element = (Element) queued_for_removal.get(a);
                 description_element.removeChild(metadata_element);

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -141 +141 @@
                 MetadataSet extracted_mds = Gatherer.c_man.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE);
                 if(extracted_mds != null) {
-                    element = extracted_mds.addElement(name, Gatherer.config.interface_language);
+                    element = extracted_mds.addElement(name, Gatherer.config.getLanguage());
                 }
                 }

trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

@@ -879 +879 @@
         Element element = mds.getElement(name);
         if (element == null) {
-        result = mds.addElement(n, Gatherer.config.interface_language);
+        result = mds.addElement(n, Gatherer.config.getLanguage());
         }
         else {

trunk/gli/src/org/greenstone/gatherer/msm/parsers/GreenstoneMetadataParser.java

@@ -211 +211 @@
         ///ystem.out.println("GreenstoneMetadataParser:Error: we have been asked to add metadata but there are no existing sets");
         // print the warning dialog
-        WarningDialog dialog = new WarningDialog("warning.MissingMDS", true);
-        if (dialog.display() == JOptionPane.CANCEL_OPTION) {
-        // the user has cancelled
-        dialog_cancelled = true;
+        if(Gatherer.f_man.complain_if_no_sets) {
+        WarningDialog dialog = new WarningDialog("warning.MissingMDS", true);
+        if (dialog.display() == JOptionPane.CANCEL_OPTION) {
+            // the user has cancelled
+            dialog_cancelled = true;
+            Gatherer.f_man.complain_if_no_sets = true;
+        }
+        else {
+            Gatherer.f_man.complain_if_no_sets = false;
+        }
         }
         return;