Changeset 3766 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2003-02-25T15:18:02+13:00 (21 years ago)

Author:

mdewsnip

Message:

Support for modified query result format (changes to "numDocsMatched" and query term information).

File:

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

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

@@ -148 +148 @@
     // System.out.println("Query response: " + converter_.getString(mr_query_response));
 
-    Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/content/metadataList");
+    Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/metadataList");
     if (query_result_metadata_list == null) {
         System.err.println("Warning: No query result metadata.\n");
     }
-    else {
-        System.out.println("Query result metadata: " + converter_.getString(query_result_metadata_list) + "\n");
+
+    Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/content/termList");
+    if (query_term_info_list == null) {
+        System.err.println("Warning: No query term information.\n");
     }
 
@@ -210 +212 @@
     // If there is some metadata about the query results, add it in
     if (query_result_metadata_list != null) {
+        result_response.appendChild(query_result_metadata_list);
+    }
+    // If there is some metadata about the query results, add it in
+    if (query_term_info_list != null) {
         Element result_content = (Element) GSXML.getChildByTagName(result_response,
                                        GSXML.CONTENT_ELEM);
-        result_content.appendChild(query_result_metadata_list);
+        result_content.appendChild(query_term_info_list);
     }