Changeset 3800

Timestamp:

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

Author:

mdewsnip

Message:

Removed option to sort by rank/natural order, and added code to deal with term information and equivalent terms.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java (modified) (8 diffs)

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

@@ -71 +71 @@
     private static final String INDEX_ELEM = "index";
 
-    public static final String COUNT_ATT = "count";
-    public static final String STEM_ATT = "stem";
+    private static final String EQUIV_TERM_ELEM = "equivTerm";
+
+    private static final String STEM_ATT = "stem";
+    private static final String NUM_DOCS_MATCH_ATT = "numDocsMatch";
+    private static final String FREQ_ATT = "freq";
 
     private MGWrapper mg_src_ = null;
@@ -186 +189 @@
         }   
     }
-    else if (name.equals(RANK_PARAM)) {
-        String[] vals1 = {RANK_PARAM_RANK, RANK_PARAM_NONE };
-        if (display) {
-        String[] vals1_texts = { getTextString("param."+RANK_PARAM+"."+RANK_PARAM_RANK, lang),
-                      getTextString("param."+RANK_PARAM+"."+RANK_PARAM_NONE, lang)};
-        
-        param = GSXML.createParameterDisplay(doc_, RANK_PARAM, getTextString("param."+RANK_PARAM, lang), vals1, vals1_texts);
-        } else {
-        param = GSXML.createParameter(doc_, RANK_PARAM, GSXML.PARAM_TYPE_ENUM_SINGLE, RANK_PARAM_RANK, vals1 );
-        }
-    }
     else if (name.equals(MAXDOCS_PARAM)) {
         if (display) {
@@ -231 +223 @@
     createParameter(STEM_PARAM, param_list, display, lang);
     createParameter(MATCH_PARAM, param_list, display, lang);
-    createParameter(RANK_PARAM, param_list, display, lang);
     createParameter(MAXDOCS_PARAM, param_list, display, lang);
     createParameter(QUERY_PARAM, param_list, display, lang);
@@ -262 +253 @@
     result.setAttribute(GSXML.FROM_ATT, from);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);
-    // result.setAttribute(GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
 
     // get param list
@@ -281 +271 @@
         index = default_index_;
     }
-    // System.out.println("Index: " + index);
 
     // now set up the mg stuff
@@ -314 +303 @@
     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
@@ -336 +324 @@
     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_;
+        MGTermInfo term_info = (MGTermInfo) terms.get(t);
+
+        String term = term_info.term_;
+        int stem_method = term_info.stem_method_;
+        Vector equiv_terms = term_info.equiv_terms_;
 
         Element term_elem = doc_.createElement(GSXML.TERM_ELEM);
         term_elem.setAttribute(GSXML.NAME_ATT, term);
-        term_elem.setAttribute(COUNT_ATT, "" + term_freq);
         term_elem.setAttribute(STEM_ATT, "" + stem_method);
+
+        Element equiv_term_list = doc_.createElement(EQUIV_TERM_ELEM+GSXML.LIST_MODIFIER);
+        term_elem.appendChild(equiv_term_list);
+
+        long total_term_freq = 0;
+        for (int et = 0; et < equiv_terms.size(); et++) {
+        MGEquivTermInfo equiv_term_info = (MGEquivTermInfo) equiv_terms.get(et);
+
+        Element equiv_term_elem = doc_.createElement(GSXML.TERM_ELEM);
+        equiv_term_elem.setAttribute(GSXML.NAME_ATT, equiv_term_info.term_);
+        equiv_term_elem.setAttribute(NUM_DOCS_MATCH_ATT, "" + equiv_term_info.match_docs_);
+        equiv_term_elem.setAttribute(FREQ_ATT, "" + equiv_term_info.term_freq_);
+        equiv_term_list.appendChild(equiv_term_elem);
+
+        total_term_freq += equiv_term_info.term_freq_;
+        }
+
+        term_elem.setAttribute(FREQ_ATT, "" + total_term_freq);
         term_list.appendChild(term_elem);
     }
@@ -377 +384 @@
         mg_src_.setMatchMode(mode);
         }
-        else if (name.equals(RANK_PARAM)) {
-        if (value.equals(RANK_PARAM_RANK)) {
-            mg_src_.setSortByRank(true);
-        } else if (value.equals(RANK_PARAM_NONE)) {
-            mg_src_.setSortByRank(false);
-        }
-        }
         else if (name.equals(MAXDOCS_PARAM)) {
         int docs = Integer.parseInt(value);