Changeset 13837

Timestamp:

2007-01-31T16:33:12+13:00 (17 years ago)

Author:

qq6

Message:

public=true add collect to both collection_list and module_map, otherwise add it to the module_map only

File:

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

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

@@ -98 +98 @@
     protected XMLConverter converter=null;
 
-    
     //***************************************************************
     // public methods
@@ -774 +773 @@
 
     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";
+    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);
+    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);
+        }
+    }
+
+
     // now we need to 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));
+
     if (init_file.exists()) {
         Document init_doc = this.converter.getDOM(init_file);
@@ -807 +832 @@
         // add to list of collections
         this.module_map.put(col_name, c);
-        //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);
+        public_info=public_info.toLowerCase().trim();
+         if(public_info.equals("true")){
+        //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 {
@@ -817 +847 @@
         return false;
     }
-    
     }