Changeset 3682 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

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)

File:

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

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);