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

Timestamp:

2012-06-07T21:34:38+12:00 (12 years ago)

Author:

ak19

Message:

Better way of removing duplicate collectionMetadata/displayItem elements from the collectionConfig.xml. Needed to do more to prevent duplicate elements than in the previous commit since the image-e/backdrop collections tested last time did not have search indexes while the reports collection does and these are the elements that got duplicated this time.

File:

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

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

@@ -31 +31 @@
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -2340 +2341 @@
         }
 
-        if (displayItemListNode != null)
-        {
-
-            NodeList nl = ((Element)displayItemListNode).getElementsByTagName(StaticStrings.DISPLAYITEM_STR);
-
-            // make a list of all unique attribute names that are specifically not
-            // description, smallicon, icon and name, since these are already processed above
-            Set setOfUniqueDisplayItemNames = new LinkedHashSet();
-            for(int i = 0; i < nl.getLength(); i++) {
-            Element displayItem = (Element)nl.item(i);
-            String name = displayItem.getAttribute(StaticStrings.NAME_ATTRIBUTE);
-
-            if(name.equals("")) continue; // no name attribute
-
-            if(name.equals(StaticStrings.DESCRIPTION_STR)) continue;
-            if(name.equals(StaticStrings.SMALLICON_STR)) continue;
-            if(name.equals(StaticStrings.ICON_STR)) continue;
-            if(name.equals(StaticStrings.NAME_STR)) continue;
-            // don't add displayItems that are handled by the indexers, etc. E.g. document:ex.Title 
-            if(name.indexOf(":") != -1) continue;
-
-            // otherwise
-            setOfUniqueDisplayItemNames.add(name); // Set will ensure no duplicate names
-            }
-            
-            Iterator i = setOfUniqueDisplayItemNames.iterator();
-            while (i.hasNext()) {
-            String displayItemName = (String)i.next();
-
-            ArrayList custom_displayItem = doDisplayItemList(dOc, displayItemListNode, displayItemName, displayItemName);       
-            appendArrayList(toElement, custom_displayItem);
-            }
-        }
-
         if (buildtype_value.equalsIgnoreCase("mg"))
         {
@@ -2381 +2348 @@
         {
             doMGPPIndexes(dOc, searchNode);
-        }
+        }       
 
         doDefaultIndex(dOc, searchNode);
@@ -2397 +2364 @@
         doReplaceListRef(dOc, fromElement);
         doServiceRackList(dOc, fromElement);
+
+        // the official displayItems in the displayItemList element have already been handled above
+        // and created as collectionmetadata elements in the dOc object
+        // Now we add in all the *other* (remaining) displayItems as collectionmeta elements
+        NodeList collectionMetadataList = dOc.getDocumentElement().getElementsByTagName(StaticStrings.COLLECTIONMETADATA_ELEMENT);
+        Set setOfUniqueColMetaNames = new HashSet();
+        for(int i = 0; i < collectionMetadataList.getLength(); i++) {
+            Element colMeta = (Element)collectionMetadataList.item(i);
+            String name = colMeta.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+            setOfUniqueColMetaNames.add(name);
+        }
+
+        if (displayItemListNode != null)
+        {
+            NodeList nl = ((Element)displayItemListNode).getElementsByTagName(StaticStrings.DISPLAYITEM_STR);
+
+            // make a list of all unique attribute names that are specifically not
+            // description, smallicon, icon and name, since these are already processed above
+            Set setOfUniqueDisplayItemNames = new LinkedHashSet();
+            for(int i = 0; i < nl.getLength(); i++) {
+            Element displayItem = (Element)nl.item(i);
+            String name = displayItem.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+
+            if(name.equals("")) continue; // no name attribute
+            if(setOfUniqueColMetaNames.contains(name)) continue;
+
+            if(name.equals(StaticStrings.DESCRIPTION_STR)) continue;
+            if(name.equals(StaticStrings.SMALLICON_STR)) continue;
+            if(name.equals(StaticStrings.ICON_STR)) continue;
+            if(name.equals(StaticStrings.NAME_STR)) continue;
+            // don't add displayItems that are handled by the indexers, etc. E.g. document:ex.Title 
+            if(name.indexOf(":") != -1) continue;
+
+            // otherwise
+            setOfUniqueDisplayItemNames.add(name); // Set will ensure no duplicate names
+            }
+            
+            Iterator i = setOfUniqueDisplayItemNames.iterator();
+            while (i.hasNext()) {
+            String displayItemName = (String)i.next();
+
+            ArrayList custom_displayItem = doDisplayItemList(dOc, displayItemListNode, displayItemName, displayItemName);       
+            appendArrayList(toElement, custom_displayItem);
+            }
+        }
 
     }