Changeset 29284

Timestamp:

2014-09-15T14:38:50+12:00 (10 years ago)

Author:

kjdon

Message:

working on getting GLI not to discard the new elements in COllectionConfig.xml - security, importOption, buildOption

File:

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

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

@@ -56 +56 @@
 
     // a list of all known top level elements
-    static final private String known_element_names_array[] = { StaticStrings.METADATALIST_STR, StaticStrings.DISPLAYITEMLIST_STR, StaticStrings.FORMAT_STR, StaticStrings.SEARCH_STR, StaticStrings.INFODB_STR, StaticStrings.BROWSE_STR, StaticStrings.IMPORT_STR, StaticStrings.DISPLAY_STR, StaticStrings.REPLACELISTREF_STR, StaticStrings.REPLACELIST_STR, StaticStrings.SERVICE_RACK_LIST_ELEMENT };
+  static final private String known_element_names_array[] = { StaticStrings.SECURITY_STR, StaticStrings.METADATALIST_STR, StaticStrings.DISPLAYITEMLIST_STR, StaticStrings.FORMAT_STR, StaticStrings.SEARCH_STR, StaticStrings.INFODB_STR, StaticStrings.BROWSE_STR, StaticStrings.IMPORT_STR, StaticStrings.IMPORT_OPTION_STR, StaticStrings.BUILD_OPTION_STR, StaticStrings.DISPLAY_STR, StaticStrings.REPLACELISTREF_STR, StaticStrings.REPLACELIST_STR, StaticStrings.SERVICE_RACK_LIST_ELEMENT };
     static final private Set known_element_names = new HashSet(Arrays.asList(known_element_names_array));
 
@@ -600 +600 @@
 
     // Transform plugins (pluginListNode) of collectionConfig.xml into the internal structure (i.e. Document to)
-    static private void doPlugin(Document to, Node pluginListNode)
+    static private void doPlugins(Document to, Node pluginListNode)
     {
         Element toElement = to.getDocumentElement();
@@ -1414 +1414 @@
     }
 
+  static private void convertSecurity(Document from, Document to)
+    {
+      Node security = XMLTools.getChildByTagNameIndexed(from.getDocumentElement(), StaticStrings.SECURITY_STR, 0);
+      if (security != null)
+        {
+          Element to_element = XMLTools.duplicateElement(to, (Element) security, true);
+          to.getDocumentElement().appendChild(to_element);
+        
+        }
+    }
     static private void convertMetadataList(Document from, Document to)
     {
@@ -1599 +1609 @@
 
     // Convert plugins in the internal(i.e. Document from) to collectionconfig.xml (i.e. Document to)
-    static private void convertPlugin(Document from, Document to)
+    static private void convertPlugins(Document from, Document to)
     {
         Element import_element = to.createElement(StaticStrings.IMPORT_STR);
@@ -2658 +2668 @@
         Element toElement = dOc.getDocumentElement();
 
+        // security element. For now, we just save as is, as you can't edit this in GLI.
+        Node securityNode = XMLTools.getChildByTagNameIndexed(fromElement, StaticStrings.SECURITY_STR,0);
+        // just save for now
+        if (securityNode != null) {
+          Element to_element = XMLTools.duplicateElement(dOc, (Element) securityNode, true);
+          toElement.appendChild(to_element);
+        }
         // It's deliberately set that 'creator', 'maintainer', and 'public' are only in English (as they are just names).
         // So the following ArrayList have only one element.
@@ -2703 +2720 @@
             {
 
-                doPlugin(dOc, pluginListNode);
+                doPlugins(dOc, pluginListNode);
             }
 
@@ -2748 +2765 @@
         }
 
-        if(buildtype_value.equalsIgnoreCase("solr")) {
+        if(buildtype_value.equalsIgnoreCase("solr") || buildtype_value.equalsIgnoreCase("lucene")) {
             doSolrFacetsAndSorts(dOc, searchNode); // <facet><displayItem /></facet> and <sort><displayItem /></sort>
+            // lucene will only have sort elements
         }
 
@@ -2846 +2864 @@
         Document skeleton = XMLTools.parseXMLFile("xml/CollectionConfig.xml", true);
         //Element internal = dOc.getDocumentElement();
+        convertSecurity(dOc, skeleton);
         convertMetadataList(dOc, skeleton);
         convertDisplayItemList(dOc, skeleton);
@@ -2853 +2872 @@
         convertIndex(dOc, skeleton);
         convertSolrFacetsAndSorts(dOc, skeleton);
-        convertPlugin(dOc, skeleton);//also do the plugout element
+        convertPlugins(dOc, skeleton);//also do the plugout element
         convertClassifier(dOc, skeleton);
         convertSubcollectionIndexes(dOc, skeleton);