Changeset 34246 for main/trunk/gli/src/org/greenstone/gatherer/util/Codec.java

Timestamp:

2020-07-04T06:34:20+12:00 (4 years ago)

Author:

ak19

Message:

Still part of commit 34241 and now also 34245.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/Codec.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/Codec.java

@@ -42 +42 @@
     static final public String ENCODE_SQUARE_BRACKETS = "ENCODE_SQUARE_BRACKETS";
     static final public String ESCAPEDHTML_TO_UNESCAPED = "ESCAPEDHTML_TO_UNESCAPED";
+    static final public String REINSTATE_HTML_TAGS = "REINSTATE_HTML_TAGS";
     static final public String GREENSTONE_TO_DOM = "GREENSTONE_TO_DOM";
     static final public String GREENSTONE_TO_TEXT = "GREENSTONE_TO_TEXT";
@@ -175 +176 @@
         "&", "&",
         "\"", """,
-        "\'", "'"
+        //"\'", "'"
     };
     TRANSFORMS.put(TEXT_TO_DOM_PRESERVE_TAGS, text_to_dom_preserve_tags);
@@ -190 +191 @@
     TRANSFORMS.put(ESCAPEDHTML_TO_UNESCAPED, escapedhtml_to_unescaped);
     escapedhtml_to_unescaped = null;
+    
+    // Reinstate tag markers <>
+    String[] reinstate_html_tags = {
+        "&lt;", "<", 
+        "&gt;", ">",
+    };
+    TRANSFORMS.put(REINSTATE_HTML_TAGS, reinstate_html_tags);
+    reinstate_html_tags = null;
+    
 
     // Transform plain html text into greenstone encoding