Changeset 3469 for trunk/gsdl3

Timestamp:

2002-10-16T09:31:28+13:00 (22 years ago)

Author:

kjdon

Message:

the xml representation of cgi args now has two attributes 'action' and 'subaction', instead of the single 'info' attribute
also small changes

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (2 diffs)

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

@@ -109 +109 @@
     Document message_doc = converter_.getDOM(xml_in);
     Element message = message_doc.getDocumentElement();
-    
-    NodeList requests = message.getElementsByTagName("request");
-    if (requests.getLength()==0) {
-        return GSHTML.errorPage("no requests in the message");
+    // there should only be one request per message
+    Element request = (Element)GSXML.getChildByTagName(message, "request");
+    if (request == null) {
+        return GSHTML.errorPage("no request in the message");
     }
 
-    //  should only be one request
-    Element req = (Element)requests.item(0);
-    String type = req.getAttribute("type"); // returns "" if no att of this name
+    String type = request.getAttribute("type"); // returns "" if no att of this name
     if (!type.equals("action")) {
         return GSHTML.errorPage("wrong type in request - should be action");
-    }
-    String info = req.getAttribute("info");
-    String action = GSPath.getFirstLink(info);
+    }   
+
+    String action = request.getAttribute("action");
     if (action.equals("")) {
         return GSHTML.errorPage(" no action specified");
@@ -143 +141 @@
     String page = a.process(message);
     return page;
-    // just pass a string for now - better to pass the doc cos already
-    // parsed it, but we want a string back
-    //String page = mi.process(xml_in);
-    
-    // output the page
-    //return page;
     }