Changeset 319 for trunk/gsdl/src/colservr/queryinfo.cpp

Timestamp:

1999-06-30T16:04:14+12:00 (25 years ago)

Author:

rjmcnab

Message:

made stemming functions available from mgsearch and made the stems
for the query terms available in queryinfo

File:

• trunk/gsdl/src/colservr/queryinfo.cpp (modified) (10 diffs)

trunk/gsdl/src/colservr/queryinfo.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/06/30 04:04:13  rjmcnab
+   made stemming functions available from mgsearch and made the stems
+   for the query terms available in queryinfo
+
    Revision 1.3  1999/06/29 22:06:23  rjmcnab
    Added a couple of fields to queryinfo to handle a special version
@@ -88 +92 @@
 {
   termstr = t.termstr;
+  termstemstr = t.termstemstr;
   termfreq = t.termfreq;
 
@@ -96 +101 @@
 {
   return ((x.termstr == y.termstr) &&
+      (x.termstemstr == y.termstemstr) &&
       (x.termfreq == y.termfreq));
 }
@@ -108 +114 @@
 {
   return ((x.termfreq < y.termfreq) ||
-      ((x.termfreq == y.termfreq) && (x.termstr < y.termstr)));
-
+      ((x.termfreq == y.termfreq) && (x.termstemstr < y.termstemstr)) ||
+      ((x.termfreq == y.termfreq) && (x.termstemstr == y.termstemstr) && (x.termstr < y.termstr)));
 }
 
@@ -115 +121 @@
 {
   return ((x.termfreq > y.termfreq) ||
-      ((x.termfreq == y.termfreq) && (x.termstr > y.termstr)));
-
+      ((x.termfreq == y.termfreq) && (x.termstemstr > y.termstemstr)) ||
+      ((x.termfreq == y.termfreq) && (x.termstemstr == y.termstemstr) && (x.termstr > y.termstr)));
 }
 
@@ -125 +131 @@
 
   outs << text_t2ascii << " t:\"" << t.termstr << "\"";
+  outs << text_t2ascii << " s:\"" << t.termstemstr << "\"";
   outs << " f:" << t.termfreq << "\n";
 
@@ -145 +152 @@
 // query results
 
-void queryresultsclass::clear ()
-{
+void queryresultsclass::clear () {
   docs_matched_set = false;;
   docs_matched = 0;
@@ -152 +158 @@
   
   docs.erase(docs.begin(),docs.end());
+  orgterms.erase(orgterms.begin(),orgterms.end());
   terms.erase(terms.begin(),terms.end());
 }
@@ -168 +175 @@
 }
 
-void queryresultsclass::sortqueryterms()
-{
+void queryresultsclass::sortuniqqueryterms() {
+  terms = orgterms;
+
+  // sort the terms
   sort (terms.begin(), terms.end());
-}
-
-void queryresultsclass::uniqqueryterms()
-{
+
+  // and then unique them
   vector<termfreqclass>::iterator new_end = unique (terms.begin(), terms.end());
   terms.erase(new_end, terms.end());
 }
-
 
 
@@ -192 +198 @@
     outs << (*docshere);
     docshere++;
+  }
+
+  outs << "orgterms\n";
+  vector<termfreqclass>::iterator orgtermshere = q.orgterms.begin();
+  vector<termfreqclass>::iterator orgtermsend = q.orgterms.end();
+  while (orgtermshere != orgtermsend) {
+    outs << (*orgtermshere);
+    orgtermshere++;
   }