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

Timestamp:

2003-01-06T15:23:47+13:00 (21 years ago)

Author:

kjdon

Message:

actions tidied up a bit, ResourceAction changed to DocumentAction, BuildAction removed, more general ProcessAction added

File:

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

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

@@ -14 +14 @@
 public class PageAction extends Action {
 
+    public static final String SHORT_ACTION_NAME = "p";
+    public static final String HOME_PAGE = "home";
+    public static final String ABOUT_PAGE = "about";
+
+    public String getActionShortName() {
+    return SHORT_ACTION_NAME;
+    }
     public Element process (Element message) {
     
@@ -20 +27 @@
     String page_name = request.getAttribute(GSXML.SUBACTION_ATT);
     if (page_name.equals("")) { // if no page specified, assume home page
-        page_name = "home";
+        page_name = HOME_PAGE;
     }
     
@@ -30 +37 @@
     // add the system stuff from message
     page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.CONFIGURATION_ELEM), true));
-    
-    if (page_name.equals("home")) {
+    // add the cgi args request
+    Element cgi_request = (Element)doc_.importNode(request, true);
+    page.appendChild(cgi_request);
+
+    if (page_name.equals(HOME_PAGE)) {
         return homePage(page, request);
-    } else if (page_name.equals("about")) {
+    } else if (page_name.equals(ABOUT_PAGE)) {
         return aboutPage(page, request);
     } else {
@@ -111 +121 @@
     HashMap params = GSXML.extractParams(cgi_paramList);
     
-    String coll_name = (String)params.get("collection");
-    if (coll_name == null || coll_name.equals("")) {
-        coll_name = (String)params.get("serviceCluster"); // cluster name
-    }
+    String coll_name = (String)params.get(GSCGI.COLLECTION_ARG);
     if (coll_name == null || coll_name.equals("")) {
         System.err.println("PageAction Error: about page requested with no collection or cluster specified!");