Changeset 25985

Timestamp:

2012-07-19T14:38:18+12:00 (11 years ago)

Author:

sjm84

Message:

All of the actions that use format statements will now merge in the global format statement

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (1 diff)

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

@@ -681 +681 @@
         if (format_elem != null)
         {
-            logger.debug("doc action found a format statement");
-            // set teh format type
+            Element global_format_elem = (Element) GSXML.getChildByTagName(format_resp, GSXML.GLOBAL_FORMAT_ELEM);
+            if(global_format_elem != null)
+            {
+                GSXSLT.mergeFormatElements(format_elem, global_format_elem, false);
+            }
+
+            // set the format type
             format_elem.setAttribute(GSXML.TYPE_ATT, "display");
             page_response.appendChild(this.doc.importNode(format_elem, true));