Changeset 3568 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/AppletAction.java

Timestamp:

2002-11-26T13:55:24+13:00 (21 years ago)

Author:

kjdon

Message:

tidied up a bit, uses new page structure and new display elements

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/AppletAction.java (modified) (6 diffs)

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

@@ -12 +12 @@
 import java.io.File;
 
+/** action class for handling applets */
 public class AppletAction extends Action {
     
 
-    public String process (Element message) {
-
+    public Element process (Element message) {
+    
 
     // find the stylesheet
@@ -22 +23 @@
 
     if (stylesheet==null) {
-        return GSHTML.errorPage("applet stylesheet not found!");
+        System.err.println("AppletAction Error: applet stylesheet not found!");
+        return null;
     }
-
-    Element request = (Element)message.getElementsByTagName(GSXML.REQUEST_ELEM).item(0);
-
-    // subaction is display/request
-    String request_type = request.getAttribute(GSXML.SUBACTION_ATT); // should be 'd' or 'r'
+    
+    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")) {
-        return GSHTML.errorPage("the sa arg to a=a should be d or 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
-    Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    cgi_.toLong(cgi_paramList);
-    HashMap params = GSXML.extractParams(cgi_paramList);
+    Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    HashMap params = GSXML.extractParams(cgi_param_list);
 
     String collection = (String)params.get("collection");
@@ -49 +51 @@
     }
 
-    System.out.println("to="+to);
-
-
     if (request_type.equals("d")) {
         // we are just displaying the applet - get the description from
@@ -62 +61 @@
         mr_message.appendChild(mr_request);
         mr_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
+        mr_request.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
         mr_request.setAttribute(GSXML.TO_ATT, to);
-        //mr_request.setAttribute(GSXML."info", "appletInfo");
         
         Element mr_response = (Element)mr_.process(mr_message);
         
-        System.out.println("applet mr response =");
-        System.out.println(converter_.getString(mr_response));
         // create the return page tree
         Element page = doc_.createElement(GSXML.PAGE_ELEM);
-        page.setAttribute(GSXML.LANG_ATT, message.getAttribute(GSXML.LANG_ATT));
+        page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
         // add the lang stuff from message
-        page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.TRANSLATION_ELEM), true));
+        page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.DISPLAY_ELEM), true));
         // add the config stuff from message
         page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, GSXML.CONFIGURATION_ELEM), true));
@@ -92 +89 @@
         Document style_doc = converter_.getDOM(new File(stylesheet));
         GSXSLT.absoluteIncludePaths(style_doc, config_);
-        return transformer_.transform(style_doc, page);    
+        return (Element)transformer_.transform(style_doc, page);    
 
     }
@@ -103 +100 @@
         mr_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
         mr_request.setAttribute(GSXML.TO_ATT, to);
-        
+        mr_request.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
+
         // just append the params for now
-        mr_request.appendChild(doc_.importNode(cgi_paramList, true));
+        mr_request.appendChild(doc_.importNode(cgi_param_list, true));
         
         Element mr_response = (Element)mr_.process(mr_message);
-        System.out.println("applet query response:");
-        // dont need to create a page, just extract the info out.
-        System.out.println(converter_.getString(mr_response));
         // add in the applet data
         String path = GSXML.RESPONSE_ELEM;
         path = GSPath.appendLink(path, GSXML.APPLET_DATA_ELEM);
         Element applet_info = (Element)GSXML.getNodeByPath(mr_response, path).getFirstChild();
-        System.out.println("applet action: applet data =");
-        System.out.println(converter_.getString(applet_info));
-        return converter_.getString(applet_info);
+        return applet_info;
 
     }
-    else {
-        // should never get here
-        return GSHTML.errorPage("applet action, wrong subaction type");
-    }
+    // should never get here
+    return null;
     }