Changeset 4080 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/BrowseAction.java

Timestamp:

2003-04-02T15:59:59+12:00 (21 years ago)

Author:

kjdon

Message:

what metadata to ask for is now dynamically determined from the xslt using a method from GSXSLT.java

File:

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

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

@@ -10 +10 @@
 
 import java.util.HashMap;
+import java.util.Vector;
 import java.io.File;
 
@@ -115 +116 @@
     }
     
-    
     // create a classifier elem to return in the page
     Element page_classifier = doc_.createElement(GSXML.CLASSIFIER_ELEM);
@@ -123 +123 @@
     String top_id = OID.getTop(classifier_node);
     page_classifier.setAttribute(GSXML.NAME_ATT, top_id);
-        
+
+    // add in the format info into the stylesheet
+    System.out.println("transforming format:"+converter_.getString(format_response));
+    Element format_elem = getAndTransformFormat(format_response);
+    System.out.println("transformed format:"+converter_.getString(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);
+        }
+    }
+            
     // get the browse structure for the selected node
     Element classify_message = doc_.createElement(GSXML.MESSAGE_ELEM);
@@ -183 +194 @@
     }
 
+    
     // get the metadata for each classifier node, 
     // then for each document node
+
     Element metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
 
@@ -190 +203 @@
     boolean did_documents = false;
     
-    // Create a parameter list to specify the required metadata information
-    // for now get Title
-    Element meta_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    Element 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, "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");
-        
-    // if there are classifier nodes (I think there always will be) 
+    
+    // if there are classifier nodes 
     // create a metadata request for the classifier, and add it to 
     // the the message
     cl_nodes = page_classifier.getElementsByTagName(GSXML.CLASS_NODE_ELEM);
-        
+    
     if (cl_nodes.getLength() > 0) {
         did_classifier = true;
@@ -219 +217 @@
         cl_meta_request.setAttribute(GSXML.LANG_ATT, lang);
         
-        cl_meta_request.appendChild(meta_param_list);
-        
         Element new_cl_nodes_list = doc_.createElement(GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
         cl_meta_request.appendChild(new_cl_nodes_list);
@@ -230 +226 @@
         new_cl_nodes_list.appendChild(cl);
         }
-    }
-    
+
+        // create and add in the param list
+        Vector classifier_metadata = GSXSLT.extractWantedMetadata(style_doc, GSXML.CLASS_NODE_ELEM);
+        if (classifier_metadata.isEmpty()) {
+        System.err.println("BrowseAction: no classifier metadata specified!!");
+        did_classifier = false;
+        metadata_message.removeChild(cl_meta_request);
+        } else {
+        Element meta_param_list = GSXML.createMetadataParamList(doc_, classifier_metadata);
+        cl_meta_request.appendChild(meta_param_list);
+        }
+
+    }
+
     // if there are document nodes in the classification (happens 
     // sometimes), create a second request for document metadata and 
@@ -244 +252 @@
         doc_meta_request.setAttribute(GSXML.LANG_ATT, lang);
         
-        // for now, use the same metadata list - this will probably change once we look at format statements
-        doc_meta_request.appendChild(meta_param_list.cloneNode(true));
-        
         Element doc_list = doc_.createElement(GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
         doc_meta_request.appendChild(doc_list);
@@ -257 +262 @@
         }
 
-    }
-
+        // create and add in the param list
+        Vector doc_metadata = GSXSLT.extractWantedMetadata(style_doc, GSXML.DOC_NODE_ELEM);
+        if (doc_metadata.isEmpty()) {
+        System.err.println("BrowseAction: no document metadata specified!!");
+        did_documents = false;
+        metadata_message.removeChild(doc_meta_request);
+        } else {
+        Element meta_param_list = GSXML.createMetadataParamList(doc_, doc_metadata);
+        doc_meta_request.appendChild(meta_param_list);
+        }
+
+
+    }
+    
     // process the metadata requests
     Element metadata_response = (Element)mr_.process(metadata_message);
@@ -288 +305 @@
     }
         
-    // add in the format info
-    Element format_elem = getAndTransformFormat(format_response);
-    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);
-        }
-    }
-    
-    System.out.println("(BrowseAction) Page:\n" + converter_.getPrettyString(page));
+
+    //System.out.println("(BrowseAction) Page:\n" + converter_.getPrettyString(page));
 
     // transform the page