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

Timestamp:

2003-03-19T14:27:25+12:00 (21 years ago)

Author:

kjdon

Message:

changed the way it gets format info

File:

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

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

@@ -75 +75 @@
     // this will probably need to be cached somehow later on. 
     
-    Element info_message = createDescribeRequest(to, lang, null); 
+    Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
+    Element info_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_DESCRIBE, to, lang); 
+    info_message.appendChild(info_request);
+
+    // also get the format stuff now if there is some
+    Element format_request = GSXML.createBasicRequest(doc_, GSXML.REQUEST_TYPE_FORMAT, to, lang);
+    info_message.appendChild(format_request);
+    // process the requests
     Element info_response = (Element) mr_.process(info_message);
+
+    System.out.println("getting format and description, response=\n"+converter_.getString(info_response));
+    // get out the description
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
     Element description = (Element)doc_.importNode(GSXML.getNodeByPath(info_response, path), true);
     page.appendChild(description);
-
-
-//      Element info_message = doc_.createElement(GSXML.MESSAGE_ELEM);
-//      Element info_request = doc_.createElement(GSXML.REQUEST_ELEM);
-//      info_message.appendChild(info_request);
-//      info_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
-//      info_request.setAttribute(GSXML.LANG_ATT, request.getAttribute(GSXML.LANG_ATT));
-    
-//      String to = collection;
-//      to = GSPath.appendLink(to, service_name);
-//      info_request.setAttribute(GSXML.TO_ATT, to);
-    
+    
+    Element format_response = (Element)info_response.getElementsByTagName(GSXML.RESPONSE_ELEM).item(1); // the second response
     
     // the main response for the page is in a response element
@@ -187 +187 @@
     meta_param_list.appendChild(meta_param);
     meta_param.setAttribute(GSXML.NAME_ATT, "metadata");
+    meta_param.setAttribute(GSXML.VALUE_ATT, "Source");
+    meta_param = doc_.createElement(GSXML.PARAM_ELEM);
+    meta_param_list.appendChild(meta_param);
+    meta_param.setAttribute(GSXML.NAME_ATT, "metadata");
+    meta_param.setAttribute(GSXML.VALUE_ATT, "Keyword");
+    meta_param = doc_.createElement(GSXML.PARAM_ELEM);
+    meta_param_list.appendChild(meta_param);
+    meta_param.setAttribute(GSXML.NAME_ATT, "metadata");
     meta_param.setAttribute(GSXML.VALUE_ATT, "Title");
         
@@ -271 +279 @@
     }
         
-    
-    //Node new_style = GSXML.getChildByTagName(response, GSXML.STYLESHEET_ELEM);
-    //if (new_style !=null) {
-    //  GSXSLT.mergeStylesheets(style_doc, (Element)new_style);
-    //  response.removeChild(new_style);
-    //}
-    // add the response to the page data
-    //page.appendChild(doc_.importNode(response, true));
-    
+    // add in the format info
+    Element format_elem = (Element)GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM);
+    if (format_elem != null) {
+        Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
+        if (this_format != null) {
+        GSXSLT.mergeStylesheets(style_doc, this_format);
+        }
+    }
     
     // transform the page
     GSXSLT.absoluteIncludePaths(style_doc, config_);
-    //System.out.println("browse page=");
-    //System.out.println(converter_.getString(page));
     return (Element)transformer_.transform(style_doc, page);
     }