Changeset 4080 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.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/QueryAction.java (modified) (8 diffs)

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

@@ -11 +11 @@
 
 import java.util.HashMap;
+import java.util.Vector;
 import java.util.Map;
 import java.util.Iterator;
@@ -155 +156 @@
     }
     
+    // add in the format info to the stylesheet if there is any
+    Element format_elem = getAndTransformFormat(format_response);
+    if (format_elem != null) {
+        GSXSLT.mergeStylesheets(style_doc, format_elem);
+    }
+
+
     // do the query
     Element mr_query_message = doc_.createElement(GSXML.MESSAGE_ELEM);
@@ -163 +171 @@
     Element query_param_list = (Element)doc_.importNode(cgi_param_list, true);
     mr_query_request.appendChild(query_param_list);
+
+    // do the query
         Element mr_query_response = (Element)mr_.process(mr_query_message);
 
@@ -169 +179 @@
     if (query_result_metadata_list == null) {
         System.err.println("QueryAction: Warning: No query result metadata.\n");
-    }
+    } else { // add it into the page response
+        page_response.appendChild(doc_.importNode(query_result_metadata_list, true)); 
+    }
+    
     path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
     Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, path);
     if (query_term_info_list == null) {
         System.err.println("QueryAction: Warning: No query term information.\n");
-    }
-
-    // this result is the list of docs.
-    // now take that list, and get the Titles
-    // for now, just create a whole new request
-    
+    } else { // add it into the page response
+        page_response.appendChild(doc_.importNode(query_term_info_list, true));
+    }
+
     // check that there are some documents - for now check the list, but later should use a numdocs metadata elem
     path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -187 +198 @@
     // documentList not present if no docs found
     if (document_list == null) {
-        
-        //Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
-
-        //page.appendChild(doc_.importNode(result_response, true));
         GSXSLT.absoluteIncludePaths(style_doc, config_);
         return (Element)transformer_.transform(style_doc, page);    
@@ -196 +203 @@
     }
     
-    // add in the format info
-    Element format_elem = getAndTransformFormat(format_response);
-    if (format_elem != null) {
-        GSXSLT.mergeStylesheets(style_doc, format_elem);
-    }
-
-    // we have a doc list, so get the metadata - for now, get title.
-    // can we dynamically decide what metadata to get?
+    
+    // we have a doc list, so get the metadata - look through the stylesheet to determine what metadata to ask for
+
+    Vector document_metadata = GSXSLT.extractWantedMetadata(style_doc, GSXML.DOC_NODE_ELEM);
+    if (document_metadata.isEmpty()) {
+        System.err.println("no document metadata specified!!");
+        // we dont need to do the metadata request, just append the original doc list and return the page
+        page_response.appendChild(doc_.importNode(document_list, true));
+        GSXSLT.absoluteIncludePaths(style_doc, config_);
+        return (Element)transformer_.transform(style_doc, page);
+
+    } 
+    // we have to do the metadata request
+
     Element mr_metadata_message = doc_.createElement(GSXML.MESSAGE_ELEM);
     Element mr_metadata_request = doc_.createElement(GSXML.REQUEST_ELEM);
@@ -213 +226 @@
     mr_metadata_request.setAttribute(GSXML.TO_ATT, to);
 
-    // Create a parameter list to specify the required metadata information
-    Element dm_param_list = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+    Element dm_param_list = GSXML.createMetadataParamList(doc_, document_metadata);
     mr_metadata_request.appendChild(dm_param_list);
-    Element dm_param = doc_.createElement(GSXML.PARAM_ELEM);
-    dm_param_list.appendChild(dm_param);
-    dm_param.setAttribute(GSXML.NAME_ATT, "metadata");
-    dm_param.setAttribute(GSXML.VALUE_ATT, "Title");
-
+    
+    
+    // add in the doc node list too
     mr_metadata_request.appendChild(doc_.importNode(document_list, true));
     Element mr_metadata_response = (Element) mr_.process(mr_metadata_message);  
@@ -229 +239 @@
     if (query_result_document_list != null) {
         page_response.appendChild(doc_.importNode(query_result_document_list, true));
-    }
-    // If there is some metadata about the query results, add it in
-    if (query_result_metadata_list != null) {
-        page_response.appendChild(doc_.importNode(query_result_metadata_list, true));
-    }
-    // If there is some metadata about the query results, add it in
-    if (query_term_info_list != null) {
-        page_response.appendChild(doc_.importNode(query_term_info_list, true));
     }