Changeset 38373 for main/trunk/greenstone3/src

Timestamp:

2023-11-15T11:40:48+13:00 (7 months ago)

Author:

kjdon

Message:

if we are page action (used as default when no action was specified), and no subaction specified, if collection is specified, use about page, otherwise use home page. This is to allow urls like library/collection/lucene-demo. This means that MR must only set a=p as teh default, not sa=home

File:

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

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

@@ -65 +65 @@
     // 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;
-      }
+    if (page_name.equals("")) {
+    if (collection.equals("")) {
+        // if no page or collection specified, assume home page
+        page_name = HOME_PAGE;
+    } else {
+        // we have specified a collection, assume about page
+        page_name = ABOUT_PAGE;
+    }
+    // we need to save this to the request for other places to know whats going on, eg transforming receptionist
+    request.setAttribute(GSXML.SUBACTION_ATT, page_name); 
+    }
 
     Element result = doc.createElement(GSXML.MESSAGE_ELEM);