Changeset 4001 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2003-03-26T12:45:21+12:00 (21 years ago)

Author:

kjdon

Message:

new page format

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/ProcessAction.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/ProcessAction.java

@@ -38 +38 @@
     Element page = doc_.createElement(GSXML.PAGE_ELEM);
     page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
-    System.out.println("(ProcessAction) Page:\n" + converter_.getPrettyString(page));
 
+    // the page response goes into a pageResponse elem
+    Element page_response = doc_.createElement(GSXML.PAGE_RESPONSE_ELEM);
+    page.appendChild(page_response);
     // what is carried out depends on the request_type
     // if rt=d, then a describe request is done,
@@ -100 +102 @@
         }
         
-        // else append the response to the page
-        page.appendChild(doc_.importNode(result_response, true));
+        // else append the contents of the response to the page - just the status elem for now
+        Element status = (Element)GSXML.getChildByTagName(result_response, GSXML.STATUS_ELEM);
+        page_response.appendChild(doc_.importNode(status, true));
     }
     
@@ -146 +149 @@
         }
     }
-    page.appendChild(description);
+    page_response.appendChild(description);
 
     // part of the data for the page is the cgi-params
     // if we have this here, do we need to do the previous step?
-    Element cgi_request = (Element)doc_.importNode(request, true);
-    page.appendChild(cgi_request);
-    
+    Element page_request = GSXML.duplicateWithNewName(doc_, request, GSXML.PAGE_REQUEST_ELEM, true);
+    page.appendChild(page_request);
+        
     // now process the page and return the result
     Document style_doc = converter_.getDOM(new File(stylesheet));