Changeset 34245 for main

Timestamp:

2020-07-04T06:33:15+12:00 (4 years ago)

Author:

ak19

Message:

Crucially related to commit r34241, this was the other half of the GLI fix, but had been debugging the committed half separately at the end so forgot to add this back in.

File:

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

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

@@ -42 +42 @@
 import org.greenstone.gatherer.metadata.MetadataElement;
 import org.greenstone.gatherer.metadata.MetadataTools;
+import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -98 +99 @@
             // Sadly, XMLTools.getNodeText(item) returns empty for any HTML in displayItem
             // so we have to do it the hard way
+            // We can't take a shortcut like format statements, which also need to keep their
+            // tags intact in collConfig.xml, because we know in advance the format tag name
+            // Can't guess at what html tag names the user uses, and there may be several at
+            // the same level inside collDescription (e.g. multiple paragraphs)
             String text = isCollDescr ? preserveHTMLInDescriptionDisplayItem(item)
                 : XMLTools.getNodeText(item); // else as before for all other displayItems
@@ -1473 +1478 @@
         if(!lang_value.equals("")) {
             e.setAttribute(lang_att, lang_value);
+
+            // Handle collection description displayItems specially again: these are allowed to go
+            // into collConfig.xml file containing tag markers, to preserve any user-added html
+            // in a format easy to edit in collConfig (rather than filled with entities)
+            if(element_name.equals(StaticStrings.DISPLAYITEM_STR) && name_value.equals(StaticStrings.DESCRIPTION_STR)) {
+            //System.err.println("@@@ Before internal coll description converted to collConfig:\n" + text);
+            // special case again: the following is going to be undone shortly again,
+            // mirroring the inverse of going from collConfig.xml to internal collConfig format
+            // upon parse()
+            // but this is what works to preserve the ampersands for output to XML context
+            // past the next line
+            //text = text.replaceAll("&", "&");
+            //text = Codec.transform(text, Codec.ESCAPEDHTML_TO_UNESCAPED);
+            text = Codec.transform(text, Codec.REINSTATE_HTML_TAGS);            
+            //System.err.println("@@@ After coll description converted to collConfig:\n" + text);
+            }
             XMLTools.setNodeText(e, text);
+
         }       
         if(!key.equals("")) {