Changeset 3945

Timestamp:

2003-03-20T14:30:15+12:00 (21 years ago)

Author:

kjdon

Message:

content elements no longer used in request or response

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XSLTServices.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XSLTServices.java

@@ -159 +159 @@
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
 
-    // get param list and content - this code same as for TextQuery - put
-    // somewhere else?
+    // get param list 
     Element param_elem=null;
-    Element content_elem=null;
     Node n = request.getFirstChild();
     while (n!=null) {
-      String node_name = n.getNodeName();
-      if (node_name.equals(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER)) {
-    param_elem = (Element)n;
-      } else if (node_name.equals(GSXML.CONTENT_ELEM)) {
-    content_elem = (Element)n;
-      }
-      n = n.getNextSibling();
-    }
-
-    if (param_elem==null || content_elem==null) {
-      System.out.println("bad query request");
-      GSXML.addError(doc_, response,"bad query request in XSLTServices");
-      return response; 
+    String node_name = n.getNodeName();
+    if (node_name.equals(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER)) {
+        param_elem = (Element)n;
+        break;
+    }
+    n = n.getNextSibling();
+    }
+
+    if (param_elem==null) { 
+    System.err.println("bad query request");
+    GSXML.addError(doc_, response,"bad query request in XSLTServices");
+    return response; 
     }
     
     // Documents are just the ids decoding using standard URL decoding
     
-    Element doc_list = (Element)GSXML.getChildByTagName(content_elem, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+    Element doc_list = (Element)GSXML.getChildByTagName(request, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
     String []ids = GSXML.getAttributeValuesFromList(doc_list, GSXML.NAME_ATT);
     for (int j=0; j<ids.length; j++) {
@@ -236 +233 @@
     }
 
-    Element c = doc_.createElement(GSXML.CONTENT_ELEM);
-    response.appendChild(c);
     Element resource_list = doc_.createElement(GSXML.RESOURCE_ELEM+GSXML.LIST_MODIFIER);
-    c.appendChild(resource_list);
+    response.appendChild(resource_list);
 
     // Framework to stringise the document