Changeset 3766

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).

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• action/QueryAction.java (modified) (2 diffs)
• service/GS2MGSearch.java (modified) (3 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);
     }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

@@ -288 +288 @@
     String textdir = GSFile.collectionTextPath(cluster_name_);
     String indexpath = GSFile.collectionIndexPath(cluster_name_, index);
-    System.out.println("Base directory: " + basedir);
-    System.out.println("Text directory: " + textdir);
-    System.out.println("Index path: " + indexpath);
 
     // set the mg query parameters to the values the user has specified
@@ -307 +304 @@
         // no docs found
         System.out.println("No results found...\n");
-        // return result;
-    }
-
-    // create a documentList element
+    }
+
+    // Create a metadata list to store information about the query results
+    Element metadata_list = GSXML.addMetaList(doc_, result);
+
+    // Add a metadata element specifying the number of matching documents
+    Element num_matches_elem = doc_.createElement(GSXML.METADATA_ELEM);
+    num_matches_elem.setAttribute(GSXML.NAME_ATT, "numDocsMatched");
+    num_matches_elem.setAttribute(GSXML.VALUE_ATT, "" + totalDocs);
+    metadata_list.appendChild(num_matches_elem);
+    // System.out.println("Metadata list: " + converter_.getString(metadata_list));
+
+    // Response content: documents and terms
     Element c = doc_.createElement(GSXML.CONTENT_ELEM);
     result.appendChild(c);
-
-    // Create a metadata list to store information about the query results
-    Element metadata_list = GSXML.addMetaList(doc_, c);
-
-    // Add a metadata element to the result content specifying the number of matches
-    GSXML.addMetadata(doc_, metadata_list, "numMatchingDocs", "" + totalDocs);
-    System.out.println("Metadata list: " + converter_.getString(metadata_list));
-
-    // get the terms out, and add to query result metadata
-    Vector terms = mqr.getTerms();
-    if (terms.size() == 0) {
-        // no terms found
-        System.out.println("No query term information available...\n");
-    }
-    else {
-        for (int t = 0; t < terms.size(); t++) {
-        String term = ((MGTermInfo) terms.elementAt(t)).term_;
-        long term_freq = ((MGTermInfo) terms.elementAt(t)).term_freq_;
-        Element metadata_elem = doc_.createElement(GSXML.METADATA_ELEM);
-        metadata_elem.setAttribute(GSXML.TYPE_ATT, "term");
-        metadata_elem.setAttribute(GSXML.NAME_ATT, term);
-        metadata_elem.setAttribute(GSXML.VALUE_ATT, "" + term_freq);
-        metadata_list.appendChild(metadata_elem);
-        }
-    }
 
     Element document_list = doc_.createElement(GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
@@ -345 +326 @@
         long docnum = ((MGDocInfo) docs.elementAt(d)).num_;
         String id = gdbm_src_.docnum2Oid(docnum);
+        System.out.println("Docnum: " + docnum + " ID: " + id);
         Node no = GSXML.createDocumentElement(doc_, id);
         document_list.appendChild(no);
+    }
+
+    Element term_list = doc_.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+    c.appendChild(term_list);
+    // get the terms out, and add to query result metadata
+    Vector terms = mqr.getTerms();
+    for (int t = 0; t < terms.size(); t++) {
+        String term = ((MGTermInfo) terms.elementAt(t)).term_;
+        long term_freq = ((MGTermInfo) terms.elementAt(t)).term_freq_;
+        int stem_method = ((MGTermInfo) terms.elementAt(t)).stem_method_;
+
+        Element term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        term_elem.setAttribute(GSXML.NAME_ATT, term);
+        term_elem.setAttribute("count", "" + term_freq);
+        term_elem.setAttribute("stem", "" + stem_method);
+        term_list.appendChild(term_elem);
     }