Changeset 3802

Timestamp:

2003-03-05T14:05:46+13:00 (21 years ago)

Author:

mdewsnip

Message:

Modified to use the DocumentMetadataRetrieve service.

File:

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

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

@@ -145 +145 @@
         
         
+    System.out.println("Query request: " + converter_.getString(mr_query_request));
     Element mr_query_response = (Element)mr_.process(mr_query_message);
-    // System.out.println("Query response: " + converter_.getString(mr_query_response));
+    System.out.println("Query response: " + converter_.getString(mr_query_response));
 
     Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/metadataList");
@@ -157 +158 @@
         System.err.println("Warning: No query term information.\n");
     }
+    System.out.println("Query term info:\n" + converter_.getString(query_term_info_list));
 
     // this result is the list of docs.
@@ -189 +191 @@
     mr_metadata_request.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
     mr_metadata_request.setAttribute(GSXML.LANG_ATT, page.getAttribute(GSXML.LANG_ATT));
-    to = GSPath.appendLink(collection, "MetadataRetrieve");
+    to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); // Hard-wired?
     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);
+    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");
+
     Element meta_content = doc_.createElement(GSXML.CONTENT_ELEM);
     mr_metadata_request.appendChild(meta_content);
@@ -198 +208 @@
     meta_content.appendChild(doc_.importNode(document_list, true));
     
-    // the second part of the content is the metadata list
-    Element metadata_list = doc_.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
-    Element title = doc_.createElement(GSXML.METADATA_ELEM);
-    title.setAttribute(GSXML.NAME_ATT, "Title");
-    metadata_list.appendChild(title);
-    meta_content.appendChild(metadata_list);
-    
-    // System.out.println("Metadata message: " + converter_.getString(mr_metadata_message));
+    // System.out.println("Metadata request: " + converter_.getString(mr_metadata_message));
     Element mr_metadata_response = (Element)mr_.process(mr_metadata_message);