Changeset 10611 for trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

Timestamp:

2005-09-21T14:32:25+12:00 (19 years ago)

Author:

kjdon

Message:

don't write out collectionmeta if the value is empty

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -499 +499 @@
                 }
                 if(command != null && command.length()> 0 ) {
-                /* if command contains buildtype only, it means that the none of
-                 * buildtype has been selected, so we don't want to write into
-                 * collect.cfg file*/
-                if (!command.matches("^buildtype\\s*")){
-                    write(buffered_writer, command);
-                    buffered_writer.newLine();
-                    just_wrote_newline = false;
-                }
+                write(buffered_writer, command);
+                buffered_writer.newLine();
+                just_wrote_newline = false;
                 }
             }
@@ -782 +777 @@
 
     static private String metadataToString(Element command_element, boolean text_value) {
+    // lets first check the value - if its empty, don't bother sticking it in the config file
+    String value_str = XMLTools.getValue(command_element);
+    if (value_str.equals("")) {
+        return "";
+    }
     boolean special = false;
-    // If there is no value attribute, then we don't write anything
+    
     StringBuffer text = new StringBuffer("");
     String name_str = command_element.getAttribute(NAME_ATTRIBUTE);
-    // If the name is one of the special four, we don't write the collectionmeta first. Note the maintainer collectionmeta is singled out for 'prittying' reasons.
+    // If the name is one of the special four, we don't write the collectionmeta first. Note maintainer and buildtype are singled out for 'prittying' reasons.
     if(name_str.equals(COLLECTIONMETADATA_MAINTAINER_STR)|| name_str.equals(BUILDTYPE_STR) ) {
         text.append(name_str);
@@ -817 +817 @@
     name_str = null;
 
-    String value_str = XMLTools.getValue(command_element);
     // The value string we retrieved will be encoded for xml, so we now decode it - to text if text_value set. This parameter was originally show_extracted_namespace, but sincethis is only true for 'toString()' commands from within the CDM, its good enough to determine if this toString() will be used to display on screen, or write to collect.cfg
     if(text_value == CollectionMeta.TEXT) {