Changeset 32553 for main/trunk

Timestamp:

2018-10-30T13:28:34+13:00 (5 years ago)

Author:

kjdon

Message:

allow missing groupDescriptions element in groupConfig.xml

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CollectionGroups.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/CollectionGroups.java

@@ -393 +393 @@
         hierarchy = (Element) GSXML.getChildByTagName(content, GSXML.HIERARCHY_ELEM);
         groupDesc = (Element) GSXML.getChildByTagName(content, GSXML.GROUP_DESC_ELEM);
-        if (hierarchy == null || groupDesc == null){
-            logger.error("Error processing groups configuration. <groupConfig> should have both <hierarchy> and <groupDescriptions> elements. Check groupConfig.xml");
+        if (hierarchy == null){
+            logger.error("<groupConfig> has no <hierarchy> element, ignoring it.");
             return false;
         }
-        verifyGroupDescription();
+        verifyGroupDescription(doc);
         return true;
     }
 
-    private void verifyGroupDescription() {
-        Document doc = groupDesc.getOwnerDocument();
+    private void verifyGroupDescription(Document doc) {
+      if (groupDesc == null) {
+        // we set up one for ourselves
+        groupDesc = doc.createElement(GSXML.GROUP_DESC_ELEM);
+      }
+      
+      //    Document doc = groupDesc.getOwnerDocument();
         NodeList groups = hierarchy.getElementsByTagName(GSXML.GROUP_ELEM);
         for (int i = 0; i < groups.getLength(); i++) {