Changeset 24425

Timestamp:

2011-08-18T20:00:27+12:00 (13 years ago)

Author:

ak19

Message:

Fixed the error whereby completely deleting a GS3 format statement from GLI (this issue was encountered in the format statement for Browse) caused a double up of format elements to be written out to the collectionConfig.xml (<format><format /></format>) which was both wrong and prevented GLI from reopening that collection.

File:

• main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfigXMLReadWrite.java

@@ -561 +561 @@
       format_element.setAttribute (StaticStrings.NAME_ATTRIBUTE, name_str);
     }
-    if (format != null) {
+    
+    // Don't write out an empty format statement of <format/> (i.e. format has no child nodes)
+    // as this will end up embedded in another format statement as <format><format/><format />
+    // This doubling up of format stmts will then prevent GLI from opening the collection again.
+    if (format != null && format.hasChildNodes()) { // not an empty format statement
       String gsf_text = XMLTools.xmlNodeToStringWithoutIndenting(format);
-               
+
       if (gsf_text.startsWith("<") && (gsf_text.indexOf("<") != gsf_text.lastIndexOf("<"))) {
     gsf_text = gsf_text.substring(gsf_text.indexOf("<gsf"),
                       gsf_text.indexOf(StaticStrings.FORMAT_END_TAG));
       }
-                
+      
       XMLTools.setNodeText(format_element, gsf_text);
     }