Changeset 13850

Timestamp:

2007-02-05T15:06:31+13:00 (17 years ago)

Author:

kjdon

Message:

collections should be public unless explicitly made private

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -774 +774 @@
     logger.info("Activating collection: "+col_name+".");
 
-    // now we need to look at the etc/collectionConfigure.xml file, and see whether the collection is public
-    String public_info="false";
+    // now we need to look at the etc/collectionConfig.xml file, and see whether the collection is public
+    boolean is_public = true; // public unless state otherwise
     File collectionConfig_file= new File(GSFile.collectionConfigFile(this.site_home, col_name));
     if (!collectionConfig_file.exists() ) {
@@ -783 +783 @@
     
     Document collectionConfig_doc = this.converter.getDOM(collectionConfig_file);
-    Element collectionConfig_info = collectionConfig_doc.getDocumentElement();
-
-    NodeList metadateList_node_list=null;
-    if (collectionConfig_info!=null){
-        metadateList_node_list = collectionConfig_info.getElementsByTagName(GSXML.METADATA_ELEM);
-     }
-
-    for (int i=0; i<metadateList_node_list.getLength(); i++) {
-        Element opt = (Element)metadateList_node_list.item(i);
-        String name = opt.getAttribute(GSXML.NAME_ATT);
-        if (name.equals("public")) {
-        public_info = GSXML.getValue(opt);
-        }
-    }
-
+    if (collectionConfig_doc != null) {
+        Element collectionConfig_info = collectionConfig_doc.getDocumentElement();
+
+        if (collectionConfig_info!=null){
+        Element metadata_list = (Element) GSXML.getChildByTagName(collectionConfig_info,GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+        if (metadata_list != null) {
+            Element meta_elem = (Element) GSXML.getNamedElement(metadata_list, GSXML.METADATA_ELEM, GSXML.NAME_ATT, "public");
+            if (meta_elem != null) {
+            String value = GSXML.getValue(meta_elem).toLowerCase().trim();
+            if (value.equals("false")) {
+                is_public = false;
+            }
+            }
+        }
+        }
+    }
 
     // now we need to look for the etc/collectionInit.xml file, and see what sort of Collection to load
@@ -832 +833 @@
         // add to list of collections
         this.module_map.put(col_name, c);
-        public_info=public_info.toLowerCase().trim();
-         if(public_info.equals("true")){
-        //add short description_ to collection_list_
+        
+        if(is_public) {
+        // only public collections will appear on the home page
+        // add short description_ to collection_list_
         Element e = this.doc.createElement(GSXML.COLLECTION_ELEM);
         e.setAttribute(GSXML.NAME_ATT, col_name);
         this.collection_list.appendChild(e);
-        }else{
-        return false;
-        }
+        } 
         return true;
     } else {