Changeset 25986

Timestamp:

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

Author:

sjm84

Message:

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

Location:

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

Files:

• BrowseAction.java (modified) (3 diffs)
• GS2BrowseAction.java (modified) (4 diffs)
• QueryAction.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/BrowseAction.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;
@@ -14 +15 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-OTE: this class not used at present!!!!!
+
+//NOTE: this class not used at present!!!!!
 /** action for classifier browsing */
 public class BrowseAction extends Action
@@ -130 +132 @@
             if (this_format != null)
             {
+                Element global_format_elem = (Element) GSXML.getChildByTagName(format_response, GSXML.GLOBAL_FORMAT_ELEM);
+                if(global_format_elem != null)
+                {
+                    GSXSLT.mergeFormatElements(this_format, global_format_elem, false);
+                }
                 Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
                 // set teh format type

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);

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

@@ -1 +1 @@
 package org.greenstone.gsdl3.action;
 
-import org.greenstone.gsdl3.core.ModuleInterface;
-import org.greenstone.gsdl3.util.*;
-// XML classes
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.util.GSParams;
+import org.greenstone.gsdl3.util.GSPath;
+import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.GSXSLT;
+import org.greenstone.gsdl3.util.UserContext;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Vector;
-import java.util.Map;
-import java.util.Iterator;
-import java.io.File;
-import java.io.Serializable;
-
-import org.apache.log4j.*;
 
 /** action class for queries */
@@ -205 +200 @@
         if (format_elem != null)
         {
+            Element global_format_elem = (Element) GSXML.getChildByTagName(format_response, 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, "search");
@@ -236 +236 @@
 
         Element mr_metadata_response = (Element) this.mr.process(mr_metadata_message);
-        
+
         // check for errors
         processErrorElements(mr_metadata_response, page_response);