Changeset 19984 for greenstone3/trunk/src/java/org/greenstone/gsdl3/action/PageAction.java

Timestamp:

2009-07-13T10:25:21+12:00 (15 years ago)

Author:

oranfry

Message:

initial implementation of support for site-level metadata

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (9 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -5 +5 @@
 //XML classes
 import org.w3c.dom.Node; 
-import org.w3c.dom.NodeList; 
-import org.w3c.dom.Document; 
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -115 +115 @@
         String uid = request.getAttribute(GSXML.USER_ID_ATT);
         // extract the params from the cgi-request, 
-        Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);        
+        Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
         HashMap params = GSXML.extractParams(cgi_paramList, false);
         
@@ -122 +122 @@
             logger.error("about page requested with no collection or cluster specified!");
             // return an empty response
-            return this.doc.createElement(GSXML.RESPONSE_ELEM);
+            Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+            addSiteMetadata(response, lang, uid);
+            return response;
         }
 
@@ -128 +130 @@
         Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
 
-        Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang, uid);
+        Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, coll_name, lang, uid);
         coll_about_message.appendChild(coll_about_request);
-
         Element coll_about_response = (Element)this.mr.process(coll_about_message);
-        
+
         // add collection type attribute to paramList
         String col_type = "";
@@ -159 +160 @@
             return null;
         }
-        
+
+
         // second, get the info for each service - we only want display items 
         // but for now, we'll just get it all
@@ -168 +170 @@
 
         Element response = (Element) GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM);
+        //add the site metadata
+        addSiteMetadata(response, lang, uid);
         return response;
     }
@@ -190 +194 @@
         if (coll_name == null || coll_name.equals("")) {
             // just return an empty response
-            return this.doc.createElement(GSXML.RESPONSE_ELEM);
+            Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+            addSiteMetadata(response, lang, uid);
+            return response;
         }
 
@@ -205 +211 @@
 
         Element response = (Element) GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM);
+
+        //add the site metadata
+        addSiteMetadata(response, lang, uid);
+
         return response;
 
@@ -275 +285 @@
         return page_response;
     }
+
+
 }