Changeset 24806 for main/trunk/gli/src

Timestamp:

2011-11-09T15:04:26+13:00 (12 years ago)

Author:

sjm84

Message:

Fixed a problem that was causing two <format> tags to appear

File:

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

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

@@ -640 +640 @@
         { // 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)); }
-             */
+            
+            //We don't want the <format> elements in the string
+            int startFormatIndex = gsf_text.indexOf(StaticStrings.FORMAT_START_TAG) + StaticStrings.FORMAT_START_TAG.length();
+            int endFormatIndex = gsf_text.lastIndexOf(StaticStrings.FORMAT_END_TAG);
+            gsf_text = gsf_text.substring(startFormatIndex, endFormatIndex);
 
             XMLTools.setNodeText(format_element, gsf_text);