Changeset 3996 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2003-03-26T12:12:10+12:00 (21 years ago)

Author:

kjdon

Message:

now gets the collection info if a collection is specified - this is needed for the httpPath metadata used to find the coll image

File:

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

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

@@ -18 +18 @@
     public Element process (Element message) {
     
-
-    // find the stylesheet
-    String stylesheet = GSFile.stylesheetFile(config_, "applet.xsl");
-
-    if (stylesheet==null) {
-        System.err.println("AppletAction Error: applet stylesheet not found!");
-        return null;
-    }
-    
     Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
     
-    
-    // get the collection and service param
+    // get the collection and service params
     Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     HashMap params = GSXML.extractParams(cgi_param_list, false);
@@ -40 +30 @@
         return null;
     }
-
+    
     String collection = (String)params.get(GSCGI.COLLECTION_ARG);
+    boolean coll_specified = true;
     String service_name=(String)params.get(GSCGI.SERVICE_ARG);
-    
+    String lang = request.getAttribute(GSXML.LANG_ATT);
     String to=null;
     if (collection==null||collection.equals("") ) {
+        coll_specified = false;
         to = service_name;
     } else {
@@ -51 +43 @@
     }
 
-    if (request_type.equals("d")) {
-        // we are just displaying the applet - get the description from
-        // the service, and process using xslt
-
-        //build up the mr request
-    
-        Element mr_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-        Element mr_request = doc_.createElement(GSXML.REQUEST_ELEM);
-        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);
-        
-        Element mr_response = (Element)mr_.process(mr_message);
-        
-        // create the return page tree
-        Element page = doc_.createElement(GSXML.PAGE_ELEM);
-        page.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
-        // add the lang stuff from message
-        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));
-        
-        page.appendChild(doc_.importNode(request, true));
-
-        // add in the applet info
-        String path = GSXML.RESPONSE_ELEM;
-        path = GSPath.appendLink(path, GSXML.SERVICE_ELEM);
-        path = GSPath.appendLink(path, GSXML.APPLET_ELEM);
-        Element app_desc = (Element)doc_.importNode(GSXML.getNodeByPath(mr_response, path), true);
-        // must handle any params that have values that are not 
-        // necessarily known by the service
-        editLocalParams(app_desc, config_.library_name_, collection);
-        page.appendChild(app_desc);
-
-        // process using the stylesheet
-        Document style_doc = converter_.getDOM(new File(stylesheet));
-        GSXSLT.absoluteIncludePaths(style_doc, config_);
-        return (Element)transformer_.transform(style_doc, page);    
-
-    }
-    else if (request_type.equals("r")) {
+    if (request_type.equals("r")) {
         // we are processing stuff for the applet send a message to the service, type="query", and take out the something element, and return that as our result - the applet must take xml
 
         Element mr_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-        Element mr_request = doc_.createElement(GSXML.REQUEST_ELEM);
+        Element mr_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_PROCESS, to, lang); 
         mr_message.appendChild(mr_request);
-        mr_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_PROCESS);
-        mr_request.setAttribute(GSXML.TO_ATT, to);
-        mr_request.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
-
-        // just append the params for now
+        // just append all the params for now - should filter out unneeded ones
         mr_request.appendChild(doc_.importNode(cgi_param_list, true));
-        
+       
+        // process the request
         Element mr_response = (Element)mr_.process(mr_message);
-        // add in the applet data
-        String path = GSXML.RESPONSE_ELEM;
-        path = GSPath.appendLink(path, GSXML.APPLET_DATA_ELEM);
+        // get the applet data out and pass it back as is. 
+        String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.APPLET_DATA_ELEM);
         Element applet_info = (Element)GSXML.getNodeByPath(mr_response, path).getFirstChild();
         return applet_info;
+        
+    }
+    
+    // else request type  = 'd'
+    // find the stylesheet
+    String stylesheet = GSFile.stylesheetFile(config_, "applet.xsl");
+    
+    if (stylesheet==null) {
+        System.err.println("AppletAction Error: applet stylesheet not found!");
+        return null;
+    }
+ 
+    // we are just displaying the applet - get the description from
+    // the service, and process using xslt
+    
+    
+    // create the return page tree
+    Element page = doc_.createElement(GSXML.PAGE_ELEM);
+    page.setAttribute(GSXML.LANG_ATT, lang);
+    // add the lang stuff from message
+    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));
 
+    // add in the page Request
+    Element page_request = GSXML.duplicateWithNewName(doc_, request, "pageRequest", true);
+    page.appendChild(page_request);
+
+    // get the applet description, and the collection info if a collection is specified
+
+    Element mr_message = doc_.createElement(GSXML.MESSAGE_ELEM);
+    Element applet_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang); 
+    mr_message.appendChild(applet_request);
+
+    if (coll_specified) {
+        Element coll_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, collection, lang); 
+        mr_message.appendChild(coll_request);
     }
-    // should never get here
-    return null;
+    
+    Element mr_response = (Element)mr_.process(mr_message);
+        
+    Element page_response = doc_.createElement(GSXML.PAGE_RESPONSE_ELEM);
+    page.appendChild(page_response);
+    // add in the applet info
+    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
+    path = GSPath.appendLink(path, GSXML.APPLET_ELEM);
+    Element app_desc = (Element)doc_.importNode(GSXML.getNodeByPath(mr_response, path), true);
+    // must handle any params that have values that are not 
+    // necessarily known by the service
+    editLocalParams(app_desc, config_.library_name_, collection);
+    page_response.appendChild(app_desc);
+    
+    if (coll_specified) {
+        Element coll_response = (Element) mr_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1);
+        Element coll_elem = (Element)GSXML.getChildByTagName(coll_response, GSXML.COLLECTION_ELEM);
+        page_response.appendChild(doc_.importNode(coll_elem, true));
+    }
+    
+    // process using the stylesheet
+    Document style_doc = converter_.getDOM(new File(stylesheet));
+    GSXSLT.absoluteIncludePaths(style_doc, config_);
+    return (Element)transformer_.transform(style_doc, page);    
+    
     }
 
     /** this method looks through the PARAMs of the applet description for 
-     * one with the name 'library'. If its found, it sets the value to be 
-     * library_name
+     * 'library' or 'collection'. If found, the params are set to  
+     * the appropriate values 
      */
     protected void editLocalParams(Element description, String library_name,