Changeset 25975

Timestamp:

2012-07-19T14:21:53+12:00 (11 years ago)

Author:

sjm84

Message:

Service racks now store the global format and return it whenever the format is requested

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -20 +20 @@
 
 // greenstone classes
-import org.greenstone.gsdl3.util.*;
-import org.greenstone.gsdl3.core.*;
-
-// xml classes
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.core.MessageRouter;
+import org.greenstone.gsdl3.core.ModuleInterface;
+import org.greenstone.gsdl3.util.CollectionClassLoader;
+import org.greenstone.gsdl3.util.Dictionary;
+import org.greenstone.gsdl3.util.GSPath;
+import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.XMLConverter;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import javax.xml.parsers.*;
-import org.apache.xpath.XPathAPI;
-
-// general java classes
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.File;
-import java.util.HashMap;
-import java.util.ResourceBundle;
-import java.util.Locale;
-import java.lang.reflect.Method;
-
-import org.apache.log4j.*;
 
 /**
@@ -94 +87 @@
     protected HashMap<String, Node> format_info_map = null;
 
+    protected Element _globalFormat = null;
+
     /**
      * A class loader that knows about the collection resources directory can
@@ -114 +109 @@
     public void cleanUp()
     {
+    }
+
+    public void setGlobalFormat(Element globalFormat)
+    {
+        _globalFormat = globalFormat;
     }
 
@@ -210 +210 @@
     public Node process(Node message_node)
     {
-
         Element message = this.converter.nodeToElement(message_node);
 
@@ -395 +394 @@
         if (this.format_info_map.containsKey(to))
         {
-            response.appendChild(getServiceFormat(to));
+            response.appendChild(response.getOwnerDocument().importNode(getServiceFormat(to), true));
+            if (_globalFormat != null)
+            {
+                response.appendChild(response.getOwnerDocument().importNode(GSXML.duplicateWithNewName(response.getOwnerDocument(), _globalFormat, GSXML.GLOBAL_FORMAT_ELEM, false), true));
+            }
+            System.err.println("RESPONSE = " + GSXML.xmlNodeToString(response));
             response.setAttribute(GSXML.FROM_ATT, to);
             return response;