Changeset 25991

Timestamp:

2012-07-19T16:42:15+12:00 (11 years ago)

Author:

sjm84

Message:

All collection pages will try to include any formatting that is global to that collection

File:

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

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

@@ -28 +28 @@
     {
         Element message = this.converter.nodeToElement(message_node);
-
         Element request = (Element) GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
+        Element paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
+        String collection = "";
+        if(paramList != null)
+        {
+            HashMap<String, Serializable> params = GSXML.extractParams(paramList, false);
+            if (params != null && params.get(GSParams.COLLECTION) != null)
+            {
+                collection = (String) params.get(GSParams.COLLECTION);
+            }
+        }
+
         // the page name is the subaction
         String page_name = request.getAttribute(GSXML.SUBACTION_ATT);
@@ -58 +68 @@
             logger.error("unknown page specified!");
             response = unknownPage(request);
+        }
+
+        Element formatMessage = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element formatRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, collection, new UserContext(request));
+        formatMessage.appendChild(formatRequest);
+        Element formatResponseMessage = (Element) this.mr.process(formatMessage);
+        Element formatResponse = (Element) GSXML.getChildByTagName(formatResponseMessage, GSXML.RESPONSE_ELEM);
+
+        Element globalFormat = (Element) GSXML.getChildByTagName(formatResponse, GSXML.FORMAT_ELEM);
+        if (globalFormat != null)
+        {
+            response.appendChild(globalFormat);
         }