Changeset 12380 for trunk/gsdl/src/colservr

Timestamp:

2006-08-02T16:30:23+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now shows the stopwords removed by Lucene, many thanks to Me and DL Consulting Ltd.

Location:

trunk/gsdl/src/colservr

Files:

• expat_resultset.cpp (modified) (1 diff)
• lucenequeryfilter.cpp (modified) (2 diffs)
• queryinfo.h (modified) (1 diff)

trunk/gsdl/src/colservr/expat_resultset.cpp

@@ -51 +51 @@
     termfreqobj.termfreq = atoi(term_frequency_str);
     queryresult_ptr->orgterms.push_back(termfreqobj);
+  }
+
+  if (element_name == "StopWord") {
+    char* stop_word_value_str = get_attribute(attributes, "value");
+    queryresult_ptr->stopwords.insert((text_t) stop_word_value_str);
   }
 

trunk/gsdl/src/colservr/lucenequeryfilter.cpp

@@ -238 +238 @@
       ++terms_here;
     }
+
+    // add the stop words
+    text_tset::iterator stopwords_here = queryresults.stopwords.begin();
+    text_tset::iterator stopwords_end = queryresults.stopwords.end();
+    while (stopwords_here != stopwords_end) {
+      response.stopwords.insert(*stopwords_here);
+      ++stopwords_here;
+    }
   }
 
@@ -367 +375 @@
     ++termvar_here;
       }
+
+      // add the stop words
+      text_tset::iterator stopwords_here = thisqueryresults.stopwords.begin();
+      text_tset::iterator stopwords_end = thisqueryresults.stopwords.end();
+      while (stopwords_here != stopwords_end) {
+    multiresults.stopwords.insert(*stopwords_here);
+    ++stopwords_here;
+      }
     }
    

trunk/gsdl/src/colservr/queryinfo.h

@@ -176 +176 @@
   termfreqclassarray terms;
   text_tset termvariants;
-  
+  text_tset stopwords;
+
   void clear ();
   queryresultsclass &operator=(const queryresultsclass &q);