Changeset 16688 for greenstone3/trunk/src/java/org/greenstone/gsdl3/action/PageAction.java

Timestamp:

2008-08-08T13:23:59+12:00 (16 years ago)

Author:

davidb

Message:

Changed 'Element process(Element)' in ModuleInterface to 'Node process(Node)'. After some deliberation is was decided this is a more useful (generic) layer of the DOM to pass information around in. Helps with the DocType problem when producing XSL Transformed pages, for example. When this was an Element, it would loose track of its DocType. Supporting method provided in XMLConverter 'Element nodeToElement(Node)' which checks a nodes docType and casts to Element if appropriate, or if a Document, typecasts to that and then extracts the top-level Element. With this fundamental change in ModuleInterface, around 20 files needed to be updated (Actions, Services, etc) that build on top of 'process()' to reflect this change, and use nodeToElement where necessary.

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (1 diff)

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

@@ -23 +23 @@
     public static final String GLI4GS3_PAGE="gli4gs3";
 
-    public Element process (Element message) {
-
-        Element request = (Element) GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
-        // the page name is the subaction
-        String page_name = request.getAttribute(GSXML.SUBACTION_ATT);
-        if (page_name.equals("")) { // if no page specified, assume home page
-            page_name = HOME_PAGE;
-        }
-        Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element response;
-        if (page_name.equals(HOME_PAGE)) {
-            response = homePage(request);
+    public Node process (Node message_node) {
+
+        Element message = this.converter.nodeToElement(message_node);
+
+        Element request = (Element) GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
+        // the page name is the subaction
+        String page_name = request.getAttribute(GSXML.SUBACTION_ATT);
+        if (page_name.equals("")) { // if no page specified, assume home page
+        page_name = HOME_PAGE;
+        }
+        Element result = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element response;
+        if (page_name.equals(HOME_PAGE)) {
+        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);
+        } else if (page_name.equals(ABOUT_PAGE) || page_name.equals(PREFS_PAGE)) {
+        response = aboutPage(request);
         //}else if (page_name.equals(PREFS_PAGE)) {
-            //response = prefsPage(request);
-        } else if (page_name.equals(GLI4GS3_PAGE)){
-            response = gli4gs3Page(request);
-        }else { // unknown page
-
-            logger.error("unknown page specified!");
-            response =  unknownPage(request);
-        }
-
-        result.appendChild(this.doc.importNode(response, true));
-        logger.debug("page action result: "+this.converter.getPrettyString(result));
-        return result;
-    }
-
+        //response = prefsPage(request);
+        } else if (page_name.equals(GLI4GS3_PAGE)){
+        response = gli4gs3Page(request);
+        }else { // unknown page
+        
+        logger.error("unknown page specified!");
+        response =  unknownPage(request);
+        }
+        
+        result.appendChild(this.doc.importNode(response, true));
+        logger.debug("page action result: "+this.converter.getPrettyString(result));
+        return result;
+    }
+    
 
     protected Element homePage(Element request) {