Changeset 9914

Timestamp:

2005-05-19T12:31:00+12:00 (19 years ago)

Author:

kjdon

Message:

added in some handling for new messaging type requests which can go between requests to modify either requests after it, or responses. eg copy nodes from the first response into the next request

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -237 +237 @@
     ///ystem.out.println("MR received request");
     ///ystem.out.println(this.converter.getString(message));
-               
     // check that its a correct message tag
     if (!message.getTagName().equals(GSXML.MESSAGE_ELEM)) {
@@ -261 +260 @@
     for (int i=0; i< num_requests; i++) {
         Node result=null;
-        Element req = (Element)requests.item(0);
+        Element req = (Element)requests.item(i);
+        if (req == null) {
+        System.err.println("request "+i+" is null");
+        continue;
+        }
         String path = req.getAttribute(GSXML.TO_ATT); // returns "" if no att of this name
         if (path.equals("")) {
         // its a message for the message router
-        result = processMessage(req);
-        mainResult.appendChild(this.doc.importNode(result, true));
+        if (req.getAttribute(GSXML.TYPE_ATT).equals(GSXML.REQUEST_TYPE_MESSAGING)) {
+            // its a messaging request - modifies the requests/responses
+            result = modifyMessages(req, message, mainResult);
+            mainResult.appendChild(this.doc.importNode(result, true));
+        } else {
+            // standard request
+            result = processMessage(req);
+            mainResult.appendChild(this.doc.importNode(result, true));
+        }
         } else {
         String [] modules = path.split(",");
+        Element mess = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element copied_request = (Element)this.doc.importNode(req, true);
+        mess.appendChild(copied_request);
+        
         for (int j=0; j<modules.length; j++) {
             String this_mod = modules[j];
             // find the module to pass it on to
             // need to put the request into a message element
-            Element mess = message_doc.createElement(GSXML.MESSAGE_ELEM);
-            req.setAttribute(GSXML.TO_ATT, this_mod);
-            mess.appendChild(req);
             String obj = GSPath.getFirstLink(this_mod);
+            
             if (this.module_map.containsKey(obj)) {
+            copied_request.setAttribute(GSXML.TO_ATT, this_mod);
             result = ((ModuleInterface)this.module_map.get(obj)).process(mess);
             if (result !=null ) {
@@ -682 +695 @@
        
     }
-
+    protected Element modifyMessages(Element request, Element message, Element result) {
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
+    response.setAttribute(GSXML.FROM_ATT, "");
+    response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_MESSAGING);
+
+    NodeList commands = request.getElementsByTagName("command");
+    if (commands == null) {
+        System.err.println("no commands, "+converter.getPrettyString(request));
+        return response;
+    }
+    for (int i=0; i<commands.getLength(); i++) {
+        Element action = (Element)commands.item(i);
+        String type = action.getAttribute(GSXML.TYPE_ATT);
+        if (type.equals("copyNode")) {
+        // copies the from node as a child of to node
+        String from_path = action.getAttribute("from");
+        String to_path = action.getAttribute("to");
+        Element from_node = null;
+        String from_node_root = GSPath.getFirstLink(from_path);
+        if (from_node_root.startsWith(GSXML.REQUEST_ELEM)) {
+            from_node = message;
+        } else if (from_node_root.startsWith(GSXML.RESPONSE_ELEM)) {
+            from_node = result;
+        }
+        if (from_node == null) {
+            continue;
+        }
+        Element to_node = null;
+        String to_node_root = GSPath.getFirstLink(to_path);
+        if (to_node_root.startsWith(GSXML.REQUEST_ELEM)) {
+            to_node = message;
+        } else if (to_node_root.startsWith(GSXML.RESPONSE_ELEM)) {
+            to_node = result;
+        }
+        if (to_node == null) {
+            continue;
+        }
+        // now we know what node to copy where
+        Node orig_node = GSXML.getNodeByPathIndexed(from_node, from_path);
+        if (orig_node == null) {
+            continue;
+        }
+        Node new_parent = GSXML.getNodeByPathIndexed(to_node, to_path);
+        if (new_parent == null) {
+            continue;
+            
+        }
+        new_parent.appendChild(to_node.getOwnerDocument().importNode(orig_node, true));
+        }
+        
+        else if (type.equals("copyChildren")) {
+
+        }
+    } // for each command
+    return response;
+    }
+    
     // ****************************************************
     // other methods