Changeset 34185

Timestamp:

2020-06-16T09:53:16+12:00 (4 years ago)

Author:

kjdon

Message:

changed doClassifier to doClassifiers as it was misleading and bugged me. copy in and out displayItems inside a classifier, so that GLI doesn't delete them. Oh this needs an overhaul. But when does one have the time...

File:

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

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

@@ -627 +627 @@
 
     //Handle classifiers
-    static private void doClassifier(Document to, Node browseNode)
+    static private void doClassifiers(Document to, Node browseNode)
     {
         Element toElement = to.getDocumentElement();
@@ -708 +708 @@
                 }
                 classify_element.appendChild(option_element);
-            }
+
+            } // for each option
+            
             //format element for this classifier
             Element format = (Element) XMLTools.getChildByTagName(e, StaticStrings.FORMAT_STR);
@@ -715 +717 @@
                 classify_element.appendChild(doFormat(to, format, null));
             }
+
+            // Handling 'displayItem' element of this 'classifier' element - for now, just copy in and out so they don't get deleted
+            NodeList di_children = e.getElementsByTagName(StaticStrings.DISPLAYITEM_STR);
+            
+            XMLTools.duplicateElementList(to, classify_element, di_children, true);
+                        
             appendProperly(toElement, classify_element);
         }
@@ -1567 +1575 @@
                 classifier_element.appendChild(convertFormat(to, e));
             }
+
+            // Handling 'displayItem' element of this 'classifier' element - for now, just copy in and out so they don't get deleted
+            NodeList di_children = child.getElementsByTagName(StaticStrings.DISPLAYITEM_STR);
+            
+            XMLTools.duplicateElementList(to, classifier_element, di_children, true);
             browse_element.appendChild(classifier_element);
         }
@@ -2682 +2695 @@
                 System.out.println("There is no classifier.");
             }
-            doClassifier(dOc, browseNode);
+            doClassifiers(dOc, browseNode);
         }