Changeset 1836 for trunk/gsdl/src/mgpp/text/MGQuery.cpp

Timestamp:

2001-01-15T12:56:57+13:00 (23 years ago)

Author:

kjm18

Message:

added support for equiv terms for highlighting. THe QueryResult.TermFreqData
has UCArrayVector equivTerms now.

File:

• trunk/gsdl/src/mgpp/text/MGQuery.cpp (modified) (6 diffs)

trunk/gsdl/src/mgpp/text/MGQuery.cpp

@@ -423 +423 @@
               bool needFragFreqs,
               FragRangeArray *fragLimits,
-              FragData &fragData) const {
+              FragData &fragData,
+              UCArrayVector &equivTerms) const {
   fragData.Clear ();
+  equivTerms.erase(equivTerms.begin(), equivTerms.end());
 
   // get a list of term numbers
-  vector<unsigned long> equivWords;
-  FindWordNumbers (indexData, term, stemMethod, equivWords);
+  vector<unsigned long> equivNums;
+  FindWordNumbers (indexData, term, stemMethod, equivNums);
 
   // get the information for each word and merge it with
@@ -434 +436 @@
   FragData tempFragData1;
   FragData tempFragData2;
-  vector<unsigned long>::iterator here = equivWords.begin();
-  vector<unsigned long>::iterator end = equivWords.end();
+  UCArray equivWord;
+  vector<unsigned long>::iterator here = equivNums.begin();
+  vector<unsigned long>::iterator end = equivNums.end();
   while (here != end) {
     // get the information for this word
     ReadTermFragData (indexData, needFragFreqs, *here,
-              tempFragData1, fragLimits);
-
+              tempFragData1, fragLimits, equivWord);
+    equivTerms.push_back(equivWord);
     // combine with last results
     tempFragData2 = fragData;
@@ -503 +506 @@
   // read in the first term
   FragData termData;
+  UCArrayVector equivTerms;
   TermNodeArray::const_iterator termHere=terms.begin(), termEnd = terms.end();
   if (termHere != termEnd) {
-    (*termHere).Calculate (indexData, needFragFreqs, fragLimitsPtr, termData);
+    (*termHere).Calculate (indexData, needFragFreqs, fragLimitsPtr, 
+               termData, equivTerms);
 
     // convert initial fragment information
@@ -515 +520 @@
             (*termHere).stemMethod,
             (*termHere).termWeight,
+            equivTerms,
             result);
   
@@ -526 +532 @@
   while (termHere != termEnd) {
     (*termHere).Calculate (indexData, needFragFreqs,
-               fragLimitsPtr, comTermData);
+               fragLimitsPtr, comTermData, equivTerms);
 
     AndFragsToQueryResult (indexData,
@@ -535 +541 @@
                (*termHere).stemMethod,
                (*termHere).termWeight,
+               equivTerms,
                result);