Changeset 25986 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

Timestamp:

2012-07-19T14:38:26+12:00 (12 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/GS2BrowseAction.java (modified) (4 diffs)

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

@@ -9 +9 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.GSXSLT;
 import org.greenstone.gsdl3.util.OID;
 import org.greenstone.gsdl3.util.UserContext;
@@ -41 +42 @@
     protected Element classifierBrowse(Element request)
     {
-
         Element page_response = this.doc.createElement(GSXML.RESPONSE_ELEM);
 
@@ -115 +115 @@
         if (format_elem != null)
         {
-
             // find the one for the classifier we are in
             Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
@@ -125 +124 @@
             if (this_format != null)
             {
+                Element global_format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.GLOBAL_FORMAT_ELEM);
+                if(global_format_elem != null)
+                {
+                    System.err.println("MERGING " + GSXML.xmlNodeToString(this_format) + "\n\nAND\n\n" + GSXML.xmlNodeToString(global_format_elem));
+                    GSXSLT.mergeFormatElements(this_format, global_format_elem, false);
+                    System.err.println("RESULT = " + GSXML.xmlNodeToString(this_format));
+                }
+
                 Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
                 extractMetadataNames(new_format, doc_meta_names, class_meta_names);