Changeset 28855

Timestamp:

2014-02-27T13:50:54+13:00 (10 years ago)

Author:

kjdon

Message:

changed to use new DOM for response xml rather than the request DOM. And fixed up a place where appending node in wrong document.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -27 +27 @@
     {
         Element message = this.converter.nodeToElement(message_node);
-        Document doc = message.getOwnerDocument();
+        Document doc = this.converter.newDOM();
         
         Element request = (Element) GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
@@ -51 +51 @@
         if (page_name.equals(HOME_PAGE))
         {
-            response = homePage(request);
+          response = homePage(request);
             //} else if (page_name.equals(ABOUT_PAGE)) {
         }
         else if (page_name.equals(ABOUT_PAGE) || page_name.equals(PREFS_PAGE))
         {
-            response = aboutPage(request);
+          response = aboutPage(request);
             //}else if (page_name.equals(PREFS_PAGE)) {
             //response = prefsPage(request);
@@ -62 +62 @@
         else if (page_name.equals(GLI4GS3_PAGE))
         {
-            response = gli4gs3Page(request);
+          response = gli4gs3Page(request);
         }
         else
         { // unknown page
-            response = unknownPage(request);
+          response = unknownPage(request);
         }
 
@@ -78 +78 @@
         if (globalFormat != null)
         {
-            response.appendChild(globalFormat);
+          response.appendChild(response.getOwnerDocument().importNode(globalFormat, true));
         }
 
@@ -87 +87 @@
     }
 
-    protected Element homePage(Element request)
-    {
-        Document doc = request.getOwnerDocument();
+  protected Element homePage(Element request)
+    {
+      Document doc = this.converter.newDOM();
         
         UserContext userContext = new UserContext(request);
@@ -154 +154 @@
     protected Element aboutPage(Element request)
     {
-        Document doc = request.getOwnerDocument();
+      Document doc = this.converter.newDOM();
         
         UserContext userContext = new UserContext(request);
@@ -238 +238 @@
     protected Element unknownPage(Element request)
     {
-        Document doc = request.getOwnerDocument();
+      Document doc = this.converter.newDOM();
         
         UserContext userContext = new UserContext(request);
@@ -326 +326 @@
     protected Element gli4gs3Page(Element request)
     {
-        Document doc = request.getOwnerDocument();
+      Document doc = this.converter.newDOM();
         
         String lang = request.getAttribute(GSXML.LANG_ATT);