Changeset 3753 for trunk

Timestamp:

2003-02-21T11:42:07+13:00 (21 years ago)

Author:

mdewsnip

Message:

Added support for query results metadata: number of matching documents, and query term information.

File:

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

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

@@ -146 +146 @@
         
     Element mr_query_response = (Element)mr_.process(mr_query_message);
-        
+    // System.out.println("Query response: " + converter_.getString(mr_query_response));
+
+    Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/content/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");
+    }
+
     // this result is the list of docs.
     // now take that list, and get the Titles
@@ -194 +203 @@
     meta_content.appendChild(metadata_list);
     
+    // System.out.println("Metadata message: " + converter_.getString(mr_metadata_message));
     Element mr_metadata_response = (Element)mr_.process(mr_metadata_message);
     
     Element result_response = (Element)GSXML.getChildByTagName(mr_metadata_response, GSXML.RESPONSE_ELEM);
     
+    // If there is some metadata about the query results, add it in
+    if (query_result_metadata_list != null) {
+        Element result_content = (Element) GSXML.getChildByTagName(result_response,
+                                       GSXML.CONTENT_ELEM);
+        result_content.appendChild(query_result_metadata_list);
+    }
+
     page.appendChild(doc_.importNode(result_response, true));
     
+    // System.out.println("XMLTransformer input: " + converter_.getString(page));
     
     // output the page
@@ -205 +223 @@
     Document style_doc = converter_.getDOM(new File(stylesheet));
     GSXSLT.absoluteIncludePaths(style_doc, config_);
-    return (Element)transformer_.transform(style_doc, page);    
+    // Node temp = transformer_.transform(style_doc, page);
+        // System.out.println("XMLTransformer output: " + converter_.getString(temp));
+    // return (Element) temp;
+    return (Element)transformer_.transform(style_doc, page);
     
     }