Changeset 34241 for main/trunk/gli/src/org/greenstone/gatherer/cdm/CollectionMeta.java

Timestamp:

2020-07-03T12:18:35+12:00 (4 years ago)

Author:

ak19

Message:

The previous commit fixed the issue where HTML in collection descriptions was not being preserved when GLI was not involved. This commit fixes the remaining problems with preserving HTML in coll descriptions when GLI is involved.

File:

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

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

@@ -162 +162 @@
      */
     public void setValue(String raw_value) {
+    setValue(raw_value, false);
+    }
+
+    public void setValue(String raw_value, boolean preserveTags) {
     // we need to check if the value has changed
     String current_value = XMLTools.getValue(element);
-    String new_value = Codec.transform(raw_value, Codec.TEXT_TO_DOM);
+    
+    String new_value = preserveTags ?
+        Codec.transform(raw_value, Codec.TEXT_TO_DOM_PRESERVE_TAGS)
+        : Codec.transform(raw_value, Codec.TEXT_TO_DOM);
     if (!current_value.equals(new_value)) {
-    // Only raw html text can be given to setValue so we need to encode it
+        // Only raw html text can be given to setValue so we need to encode it
         XMLTools.setValue(element, new_value);
         text = null; // Reset text