Changeset 25465 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java

Timestamp:

2012-04-24T13:17:35+12:00 (12 years ago)

Author:

kjdon

Message:

look for public true/false metadata, and set is_public accordingly. pass messages that we can't process to super class so that security requests can be processed.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/XMLCollection.java

@@ -43 +43 @@
     Element display_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.DISPLAY_TEXT_ELEM+GSXML.LIST_MODIFIER);
     if (display_list != null) {
+      resolveMacros(display_list);
         addDisplayItems(display_list);
     }
@@ -54 +55 @@
     }
     
+    // are we a private collection??
+    if (this.metadata_list != null) {
+      
+      Element meta_elem = (Element) GSXML.getNamedElement(this.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;
+        }
+      }
+    }
     Element config_doc_list = (Element)GSXML.getChildByTagName(coll_config_xml, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
     if (config_doc_list != null) {
@@ -117 +130 @@
         return response;
     }
-    
-    if (type.equals(GSXML.REQUEST_TYPE_SYSTEM)) {
-        response = processSystemRequest(request);
-    } else { // unknown type
-        logger.error("cant handle request of type "+ type);
+    return super.processMessage(request);
         
-    }
-    return response;
     }
-
+  
 }