Changeset 4857 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

Timestamp:

2003-07-02T16:36:06+12:00 (21 years ago)

Author:

kjdon

Message:

now looks for metadata names from format statements

File:

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

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

@@ -11 +11 @@
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Vector;
 import java.util.Map;
@@ -85 +86 @@
     }
     
+    HashSet metadata_names = new HashSet();
+    // add in the default elements
+    metadata_names.add("Title");
     // add in the format info to the stylesheet if there is any
     Element format_elem = (Element)GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM);
     if (format_elem != null) {
-        System.out.println("QueryAction: found a format element, adding it to the page response");
+        ///ystem.out.println("QueryAction: found a format element, adding it to the page response");
         // set teh format type
         format_elem.setAttribute(GSXML.TYPE_ATT, "search");
         // for now just add to the response
         page_response.appendChild(doc_.importNode(format_elem, true));
+        extractMetadataNames(format_elem, metadata_names);
     }
-
+    
 
     // do the query
@@ -146 +151 @@
     // just get all for now - the receptionist should perhaps pass in some
     // metadata that it wants, and QueryAction should look through the format stuff to see if there is any other?
-    Element dm_param_list  = doc_.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    Element param = doc_.createElement(GSXML.PARAM_ELEM);
-    dm_param_list.appendChild(param);
-    param.setAttribute(GSXML.NAME_ATT, "metadata");
-    param.setAttribute(GSXML.VALUE_ATT, "all");
+    
+    Element dm_param_list  = createMetadataParamList(metadata_names);
+    
     mr_metadata_request.appendChild(dm_param_list);