Changeset 6371

Timestamp:

2004-01-09T12:28:36+13:00 (20 years ago)

Author:

kjdon

Message:

made some changes. this file not used but may use later

File:

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

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

@@ -10 +10 @@
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Vector;
 import java.io.File;
 
+//NOTE: this class not used at present!!!!!
 /** action for classifier browsing */
 public class BrowseAction extends Action {
@@ -57 +59 @@
 
     String lang = request.getAttribute(GSXML.LANG_ATT);
+    String uid = request.getAttribute(GSXML.USER_ID_ATT);   
     String to = GSPath.appendLink(collection, service_name);
     
@@ -64 +67 @@
     
     Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang); 
+    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, uid); 
     info_message.appendChild(info_request);
     
     // also get the format stuff now if there is some
-    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang);
+    Element format_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT, to, lang, uid);
     info_message.appendChild(format_request);
     // process the requests
@@ -99 +102 @@
     // the id of the classifier is the top id of the selected node
     String top_id = OID.getTop(classifier_node);
+    
+    HashSet metadata_names = new HashSet();
 
     // add the format info into the response
@@ -105 +110 @@
         // find the one for the classifier we are in
         Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
+        if (this_format == null) {
+        this_format = (Element)GSXML.getChildByTagName(format_elem, GSXML.DEFAULT_ELEM);
+        }
         if (this_format != null) {
         Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
@@ -111 +119 @@
 
         page_response.appendChild(new_format);
-        }
-    }
-    
+        extractMetadataNames(new_format, metadata_names);
+        }
+    }
+    
+    System.out.println("extracted meta names, "+metadata_names.toString());
     // get the browse structure for the selected node
     Element classify_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
@@ -205 +215 @@
         // should be based on info sent in from the recept, and the 
         // format stuff
-        Element cl_param_list  = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-        Element p = this.doc.createElement(GSXML.PARAM_ELEM);
-        cl_param_list.appendChild(p);
-        p.setAttribute(GSXML.NAME_ATT, "metadata");
-        p.setAttribute(GSXML.VALUE_ATT, "all");
+        Element cl_param_list = null;
+        if (metadata_names.isEmpty()) {
+        cl_param_list  = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        Element p = this.doc.createElement(GSXML.PARAM_ELEM);
+        cl_param_list.appendChild(p);
+        p.setAttribute(GSXML.NAME_ATT, "metadata");
+        p.setAttribute(GSXML.VALUE_ATT, "Title");
+        } else {
+        cl_param_list  = createMetadataParamList(metadata_names);
+        }
+
         cl_meta_request.appendChild(cl_param_list);