Changeset 5655

Timestamp:

2003-10-16T11:34:07+13:00 (21 years ago)

Author:

jmt12

Message:

Codec stuff for Format commands to avoid newline problem

File:

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

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

@@ -551 +551 @@
     }
     else {
-        value_str = MSMUtils.getValue(command_element);
-        // Remove any references to a namespace for extracted metadata
-        if(!show_extracted_namespace) {
-        value_str.replaceAll(EXTRACTED_PREFIX, "");
-        }
-        text.append(SPEECH_CHARACTER);
-        text.append(value_str);
-        text.append(SPEECH_CHARACTER);
+       // Remember to encode format string to Greenstone specification
+       value_str = Codec.transform(MSMUtils.getValue(command_element), Codec.DOM_TO_GREENSTONE);
+       // Remove any references to a namespace for extracted metadata
+       if(!show_extracted_namespace) {
+          value_str.replaceAll(EXTRACTED_PREFIX, "");
+       }
+       text.append(SPEECH_CHARACTER);
+       text.append(value_str);
+       text.append(SPEECH_CHARACTER);
     }
     value_str = null;
@@ -973 +974 @@
             format_value = format_value.substring(1, format_value.length() - 1);
             }
+            // Decode from Greenstone back into text
+            format_value = Codec.transform(format_value, Codec.GREENSTONE_TO_DOM);
+            // And add to DOM
             MSMUtils.setValue(command_element, format_value);
         }