Changeset 3467

Timestamp:

2002-10-16T09:27:55+13:00 (22 years ago)

Author:

kjdon

Message:

the xml representation of cgi args now has two attributes 'action' and 'subaction', instead of the single 'info' attribute

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• LibraryServlet.java (modified) (2 diffs)
• action/AppletAction.java (modified) (1 diff)
• action/BrowseAction.java (modified) (1 diff)
• action/PageAction.java (modified) (4 diffs)
• action/QueryAction.java (modified) (1 diff)
• action/ResourceAction.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -52 +52 @@
     config_.createXML();
     
-    // new message router - create it and pass a handle to recept.
+    // new message router - create it and pass reference to recept.
     // the servlet wont use this directly
     message_router_ = new MessageRouter();
@@ -85 +85 @@
         // display the home page
         // a=p&p=home
-        xml_request +="<request type='action' output='html' info='p/home'/>";
+        xml_request +="<request type='action' output='html' action='p' subaction='home'/>";
     } else {
         String subaction = request.getParameter("sa");
-        xml_request += "<request type='action' info='"+action;
+        xml_request += "<request type='action' action='"+action+"'";
         if (subaction != null) {
-        xml_request += "/"+subaction;
+        xml_request += " subaction='"+subaction+"'";
         }
-        xml_request += "'><paramList>";
+        xml_request += "><paramList>";
         Enumeration params = request.getParameterNames();
         while(params.hasMoreElements()) {

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

@@ -26 +26 @@
 
     Element request = (Element)message.getElementsByTagName("request").item(0);
-    // the applet info is like a/d = applet/display
-    String info = request.getAttribute("info");
-    // remove the a/ bit
-    info = GSPath.removeFirstLink(info);
-    String request_type = GSPath.getFirstLink(info); // should be 'd' or 'r'
+
+    // subaction is display/request
+    String request_type = request.getAttribute("subaction"); // should be 'd' or 'r'
     if (!request_type.equals("d")&&!request_type.equals("r")) {
         return GSHTML.errorPage("the sa arg to a=a should be d or r!!");

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

@@ -25 +25 @@
     Element request = (Element)message.getElementsByTagName("request").item(0);
     
-    String info = request.getAttribute("info");
-    // remove the b/ bit
-    info = GSPath.removeFirstLink(info);
-    String browse_type = GSPath.getFirstLink(info);
+    // the browse type is the subaction
+    String browse_type = request.getAttribute("subaction");
     
     if (browse_type.equals("classifier")) {

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

@@ -17 +17 @@
     
     Element request = (Element)message.getElementsByTagName("request").item(0);
-    String info = request.getAttribute("info");
-    // remove the page/ bit
-    info = GSPath.removeFirstLink(info);
-    String page_name = GSPath.getFirstLink(info);
+    // the page name is the subaction
+    String page_name = request.getAttribute("subaction");
 
     // create the return page tree
@@ -87 +85 @@
     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);    
     
@@ -97 +97 @@
     HashMap params = GSXML.extractParams((Element)GSXML.getNodeByPath(request, "paramList"));
     String coll_name = (String)params.get("c");
+    if (coll_name == null || coll_name.equals("")) {
+        coll_name = (String)params.get("sc"); // cluster name
+    }
+    if (coll_name == null || coll_name.equals("")) {
+        return GSHTML.errorPage("about page - need to specify coll name or cluster name");
+    }
 
     Element coll_about_message = doc_.createElement("message");
@@ -108 +114 @@
     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, "response"), true));

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

@@ -30 +30 @@
 
     Element request = (Element)message.getElementsByTagName("request").item(0);
-    String info = request.getAttribute("info");
-    // remove the q/ bit
-    info = GSPath.removeFirstLink(info);
-    String query_type = GSPath.getFirstLink(info);
+    // query type is teh subaction
+    String query_type = request.getAttribute("subaction");
     
     if (query_type.equals("")) {

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

@@ -25 +25 @@
     }
 
-    // for now, info="r" eventually we may want to change to r/text r/assoc
-    // or something
+    // for now, no subaction eventually we may want to have subactions such as text assoc or something ?
+    
     Element request = (Element)message.getElementsByTagName("request").item(0);