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

Timestamp:

2002-11-26T13:55:24+13:00 (21 years ago)

Author:

kjdon

Message:

tidied up a bit, uses new page structure and new display elements

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (5 diffs)

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

@@ -14 +14 @@
 public class PageAction extends Action {
 
-    public String process (Element message) {
+    public Element process (Element message) {
     
-    Element request = (Element)message.getElementsByTagName(GSXML.REQUEST_ELEM).item(0);
+    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";
+    }
+    
     // create the return page tree
     Element page = doc_.createElement(GSXML.PAGE_ELEM);
-    page.setAttribute(GSXML.LANG_ATT, message.getAttribute(GSXML.LANG_ATT));
-    // add the lang stuff from xml_in
-    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.TRANSLATION_ELEM), true));
-    // add the system stuff from xml_in
+    page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
+    // add the lang stuff from message
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.DISPLAY_ELEM), true));
+    // add the system stuff from message
     page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.CONFIGURATION_ELEM), true));
-
-    if (page_name.equals("")) {
-        // for now send an error. change to always display the home page?
-        return GSHTML.errorPage(" page action specified, but no page specified");
-    }
+    
     if (page_name.equals("home")) {
         return homePage(page, request);
@@ -37 +36 @@
         return aboutPage(page, request);
     } else {
-        return GSHTML.errorPage("page: "+page_name+" not yet implemented");
+        System.err.println("PageAction Error: unimplemented page specified!");
+        return null; 
     }
     }
-
-
-    protected String homePage(Element page, Element orig_message) {
+    
+    protected Element homePage(Element page, Element orig_message) {
     
-    // first, get the list of collections from mr
-    
+    // first, get the message router info
     Element coll_list_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    coll_list_message.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
     Element coll_list_request = doc_.createElement(GSXML.REQUEST_ELEM);
     coll_list_message.appendChild(coll_list_request);
     coll_list_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
-    //coll_list_request.setAttribute("info", "collectionList");
-    
+    coll_list_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
+    System.out.println("PageAction: getting mesage router description.");
     Element coll_list_response = (Element)mr_.process(coll_list_message);
     if (coll_list_response==null) {
-        return GSHTML.errorPage("couldn't query the mr about collections");
+        System.err.println("PageAction Error: couldn't query the message router!");
+        return null;
     }
     
-    // second, get the metadata for each collection
+    // second, get the metadata for each collection - we only want specific
+    // elements but for now, we'll just get it all
     NodeList colls = coll_list_response.getElementsByTagName(GSXML.COLLECTION_ELEM);
-    
-    //Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    //metadata_message.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
-    //Element metadata_request = doc_.createElement(GSXML.REQUEST_ELEM);
-    //metadata_message.appendChild(metadata_request);
-    //metadata_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);   
+    // we will send all the requests in a single message
+    Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     for (int i=0; i<colls.getLength(); i++) {
-        Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-        metadata_message.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
         Element metadata_request = doc_.createElement(GSXML.REQUEST_ELEM);
+        metadata_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE); 
+        metadata_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
+        Element c = (Element)colls.item(i);
+        String name = c.getAttribute(GSXML.NAME_ATT);       
+        metadata_request.setAttribute(GSXML.TO_ATT, name); // overwrites the old value  
+        // add this request to the message
         metadata_message.appendChild(metadata_request);
-        metadata_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE); 
-    
-        // get the metadata for each one
-        Element c = (Element)colls.item(i);
-        String name = c.getAttribute(GSXML.NAME_ATT);
-        System.out.println("getting metadata for coll "+name);
-        
-        metadata_request.setAttribute(GSXML.TO_ATT, name); // overwrites the old value
-        System.out.println("metadata message = \n"+converter_.getString(metadata_message));
-        Element metadata_response = (Element)mr_.process(metadata_message);
-        Element coll = (Element)metadata_response.getElementsByTagName(GSXML.COLLECTION_ELEM).item(0);
-        if (coll==null) {
-        System.out.println("coll is null, in \n"+converter_.getString(metadata_response));
+    }
+    System.out.println("PageAction: getting metadata for each collection.");
+    Element metadata_response = (Element)mr_.process(metadata_message);
+
+    NodeList coll_responses = metadata_response.getElementsByTagName(GSXML.COLLECTION_ELEM);
+    // check that have same number of responses as collections
+    if (colls.getLength() != coll_responses.getLength()) {
+        System.err.println("PageAction Error: didn't get a response for each collection - somethings gone wrong!");
+        // for now, dont use the metadata
+    } else {
+        for (int i=0; i<colls.getLength(); i++) {
+        Element c1 = (Element)colls.item(i);
+        Element c2 = (Element)coll_responses.item(i);
+        if (c1.getAttribute(GSXML.NAME_ATT).equals(c2.getAttribute(GSXML.NAME_ATT))) {
+            // add the metadata to the original response   
+            GSXML.mergeMetadataLists(c1, c2); // add the metadata to the original response   
+        } else {
+            System.err.println("PageAction Error: response does not correspond to request!");
+        } 
+        
         }
-        GSXML.mergeMetadataLists(c, coll); // add the metadata to the original response
     }
 
@@ -96 +101 @@
     Document style_doc = converter_.getDOM(new File(stylesheet));
     GSXSLT.absoluteIncludePaths(style_doc, config_);
-    //System.out.println("page=");
-    //System.out.println(converter_.getString(page));
-    return transformer_.transform(style_doc, page);    
+    return (Element)transformer_.transform(style_doc, page);        
     
-             
     } // homePage
 
-    protected String aboutPage(Element page, Element request) {
+    protected Element aboutPage(Element page, Element request) {
 
     // extract the params from the cgi-request, 
-    // first convert short to long names
     Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    cgi_.toLong(cgi_paramList);
     HashMap params = GSXML.extractParams(cgi_paramList);
     
@@ -116 +116 @@
     }
     if (coll_name == null || coll_name.equals("")) {
-        return GSHTML.errorPage("about page - need to specify coll name or cluster name");
+        System.err.println("PageAction Error: about page requested with no collection or cluster specified!");
+        return null;
     }
-
+    
+    // get the collection or cluster description
     Element coll_about_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-    coll_about_message.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
-
     Element coll_about_request = doc_.createElement(GSXML.REQUEST_ELEM);
     coll_about_message.appendChild(coll_about_request);
     coll_about_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
     coll_about_request.setAttribute(GSXML.TO_ATT, coll_name);
-
+    coll_about_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
+    
     Element coll_about_response = (Element)mr_.process(coll_about_message);
 
-    //  System.out.println("coll response=");
-    //System.out.println(converter_.getString(coll_about_response));
     // add the response to the page 
     page.appendChild(doc_.importNode(GSXML.getChildByTagName(coll_about_response, GSXML.RESPONSE_ELEM), true));
@@ -138 +137 @@
     Document style_doc = converter_.getDOM(new File(stylesheet));
     GSXSLT.absoluteIncludePaths(style_doc, config_);
-    return transformer_.transform(style_doc, page);    
+    return (Element)transformer_.transform(style_doc, page);