Changeset 3682

Timestamp:

2003-01-17T10:45:27+13:00 (21 years ago)

Author:

kjdon

Message:

changes to cgi args: a=action, sa=subaction, s=servicename, rt=request-type (d for display, r for request, s for status) ro=request-only (dont process the page using xslt, just pass back the xml)

Location:

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

Files:

• AppletAction.java (modified) (2 diffs)
• BrowseAction.java (modified) (6 diffs)
• ProcessAction.java (modified) (8 diffs)
• QueryAction.java (modified) (4 diffs)

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

@@ -29 +29 @@
     Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
     
-    // subaction is display (d) or request (r)
-    String request_type = request.getAttribute(GSXML.SUBACTION_ATT); 
-    if (!request_type.equals("d")&&!request_type.equals("r")) {
-        System.err.println("AppletAction Error: the sa arg should be either d or r, instead it was "+request_type+"!");
-        return null;
-    }
     
     // get the collection and service param
@@ -40 +34 @@
     HashMap params = GSXML.extractParams(cgi_param_list);
 
+    // request_type is display (d) or request (r)
+    String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);
+    if (!request_type.equals("d")&&!request_type.equals("r")) {
+        System.err.println("AppletAction Error: the rt arg should be either d or r, instead it was "+request_type+"!");
+        return null;
+    }
+
     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     String service_name=(String)params.get(GSCGI.SERVICE_ARG);
-    service_name+= "Applet";
     
     String to=null;

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

@@ -14 +14 @@
 public class BrowseAction extends Action {
     
+    public static final String CLASSIFIER_ARG = "cl";
+
+    /* add the action specific args to the cgi param list
+     */
+    public void addCGIParams() {
+    cgi_.addStaticParam(CLASSIFIER_ARG);
+    }
+
+    /** process the request */
     public Element process (Element message) {
 
@@ -28 +37 @@
 
     
-    // the browse type is the subaction
-    String browse_type = request.getAttribute(GSXML.SUBACTION_ATT);
+    // the browse type is the subaction - ignore for now
+    //String browse_type = request.getAttribute(GSXML.SUBACTION_ATT);
     
-    if (browse_type.equals("Classifier")) {
-        return classifierBrowse(page, request);
-    }
-    return unknownBrowse(page, request, browse_type);
+    //if (browse_type.equals("classifier")) {
+    return classifierBrowse(page, request);
+    //}
+    //return unknownBrowse(page, request, browse_type);
 
     
@@ -54 +63 @@
     HashMap params = GSXML.extractParams(cgi_paramList);
 
+    String service_name = (String)params.get(GSCGI.SERVICE_ARG);
     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     if (collection == null || collection.equals("")) {
@@ -71 +81 @@
 
     String to = collection;
-    to = GSPath.appendLink(to, "ClassifierBrowse");
+    to = GSPath.appendLink(to, service_name);
     mr_info_request.setAttribute(GSXML.TO_ATT, to);
 
@@ -88 +98 @@
     
     // if there is a cl field in the cgi params, get the classifier info
-    String node = (String)params.get("cl");
+    String node = (String)params.get(CLASSIFIER_ARG);
     
     if (node!=null && !node.equals("")) {
@@ -121 +131 @@
         
         Element response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
-        Node new_style = GSXML.getChildByTagName(response, "stylesheet");
+        Node new_style = GSXML.getChildByTagName(response, GSXML.STYLESHEET_ELEM);
         if (new_style !=null) {
         GSXSLT.mergeStylesheets(style_doc, (Element)new_style);

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

@@ -16 +16 @@
 public class ProcessAction extends Action {
     
-    public static final String PROCESS_ONLY_ARG="p";
-
-    /** add the action specific args to the GSCGI object */
-    protected void addCGIParams() {
-    cgi_.addStaticParam(PROCESS_ONLY_ARG);
-    
-    }
     /** process a request */
     public Element process (Element message) {
@@ -28 +21 @@
     // assume only one request
     Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
-    String subaction = request.getAttribute(GSXML.SUBACTION_ATT);
+
+    // we ignore the subaction for now - all types are processed by the same method
+    //String subaction = request.getAttribute(GSXML.SUBACTION_ATT);
     // get the param list
     Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -34 +29 @@
     String service_name = (String) params.get(GSCGI.SERVICE_ARG);
     String cluster_name = (String) params.get(GSCGI.CLUSTER_ARG);
-    String process_p = (String)params.get(PROCESS_ONLY_ARG);
-    boolean process_only = false;
-    if (process_p!=null) {
-        process_only = (((String)params.get(PROCESS_ONLY_ARG)).equals("1")?true:false);
+    String request_only_p = (String)params.get(GSCGI.REQUEST_ONLY_ARG);
+    boolean request_only = false;
+    if (request_only_p!=null) {
+        request_only = (request_only_p.equals("1")?true:false);
     }
+    String request_type = (String) params.get(GSCGI.REQUEST_TYPE_ARG);
     // the return page
     Element page = doc_.createElement(GSXML.PAGE_ELEM);
     page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
 
-    // what is carried out depends on the subaction 
-    // if sa=d, then a describe request is done,
-    // is sa=r, a request and then a describe request is done
-    // if sa=s, a status request is done.
+    // what is carried out depends on the request_type
+    // if rt=d, then a describe request is done,
+    // is rt=r, a request and then a describe request is done
+    // if rt=s, a status request is done.
 
-    // if p=1, then this calls for a process only page - we do the request
-    // (sa should be r or s) and just give the response straight back
+    // if ro=1, then this calls for a process only page - we do the request
+    // (rt should be r or s) and just give the response straight back
     // without any page processing
 
@@ -55 +51 @@
     String stylesheet = GSFile.stylesheetFile(config_, "process.xsl");
     
-    if (!process_only) {
+    if (!request_only) {
         // check that the stylesheet is present
         if (stylesheet==null) {
-        System.err.println("ProcessAction Error: build stylesheet not found!");
+        System.err.println("ProcessAction Error: process stylesheet not found!");
         return null;
         }
@@ -67 +63 @@
     to = GSPath.appendLink(to, service_name);
 
-    if (!subaction.equals("d")) {
-        // if sa=s or sa=r, do the request
+    if (!request_type.equals("d")) {
+        // if rt=s or rt=r, do the request
         
         Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
@@ -74 +70 @@
         mr_query_message.appendChild(mr_query_request);
         
-        if (subaction.equals("s")) { // status
+        if (request_type.equals("s")) { // status
         mr_query_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_STATUS);
         } else {
@@ -89 +85 @@
         Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
         
-        if (process_only) {
+        if (request_only) {
         // just send the reponse as is
         return result_response;
@@ -147 +143 @@
     page.appendChild(cgi_request);
     
-    System.out.println("process action, page=");
-    System.out.println(converter_.getString(page));
     // now process the page and return the result
     Document style_doc = converter_.getDOM(new File(stylesheet));

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

@@ -33 +33 @@
        page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.CONFIGURATION_ELEM), true));
 
-    // query type is the subaction
-    String query_type = request.getAttribute(GSXML.SUBACTION_ATT) + "Query";
-    
-    // for now assume all queries can be handled by basic query
-    return basicQuery(page, request, query_type);
-    
+       // if want to have a different type of query here, check the subaction att of request
+
+       // for now assume all queries can be handled by basic query
+       return basicQuery(page, request);
+       
     }
     
@@ -45 +44 @@
      * params to the service, then gets the titles for any results 
      */
-    protected Element basicQuery(Element page, Element request, String service_name) {
+    protected Element basicQuery(Element page, Element request) {
 
     // check that the stylesheet is present - cant output the page without one. 
@@ -58 +57 @@
     
     HashMap params = GSXML.extractParams(cgi_param_list);
-
+    
+    String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);
+    String service_name = (String)params.get(GSCGI.SERVICE_ARG);
     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     if (collection == null || collection.equals("")) {
@@ -122 +123 @@
     page.appendChild(description);
 
-    // now we always do the query - we have no way of knowing whether 
-    // a query was specified or not cos we cant assume that q is the 
-    // query string - maybe we could check that any required params have
-    // a value??
-    
+    // just a display request
+    if (request_type.equals("d")) {
+        // output the page
+        // process using the stylesheet
+        Document style_doc = converter_.getDOM(new File(stylesheet));
+        GSXSLT.absoluteIncludePaths(style_doc, config_);
+        return (Element)transformer_.transform(style_doc, page);    
+    }
+        
+    // do the query
     Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     Element mr_query_request = doc_.createElement(GSXML.REQUEST_ELEM);