Changeset 13860

Timestamp:

2007-02-05T17:13:25+13:00 (17 years ago)

Author:

kjdon

Message:

made the determination of public/private come from the collection, which is already reading in collectionConfig.xml, rather than determined by the MessageRouter, which shouldn't need to read collectionConfig.xml

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• collection/Collection.java (modified) (3 diffs)
• core/MessageRouter.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -48 +48 @@
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.collection.Collection.class.getName());
 
+    /** is this collection public or private */
+    protected boolean is_public = true;
     protected XMLTransformer transformer = null;
     /** same as setClusterName */
@@ -93 +95 @@
     
     }
+
+    public boolean isPublic() {
+    return is_public;
+    }
     /** 
      * load in the collection config file into a DOM Element 
@@ -153 +159 @@
         resolveMacros(display_list);
         addDisplayItems(display_list);
+    }
+
+    // check whether we are public or not
+    if (meta_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;
+        }
+        }
     }
     return true;

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/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() ) {
-        System.err.println("MessageRouter: site collection config file: "+collectionConfig_file.getPath()+" not found!");
-        return false;
-    }
-    
-    Document collectionConfig_doc = this.converter.getDOM(collectionConfig_file);
-    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
+    // Look for the etc/collectionInit.xml file, and see what sort of Collection to load
     Collection c = null;
     File init_file = new File(GSFile.collectionInitFile(this.site_home, col_name));
@@ -820 +794 @@
         }
     }
-    if (c==null) { // we haven't found anpther classname to use
+    if (c==null) { // we haven't found another classname to use
         c = new Collection();
     }
@@ -834 +808 @@
         this.module_map.put(col_name, c);
         
-        if(is_public) {
+        if(c.isPublic()) {
         // only public collections will appear on the home page
         // add short description_ to collection_list_