Changeset 12887

Timestamp:

2006-09-28T11:03:42+12:00 (18 years ago)

Author:

kjdon

Message:

Accent folding patch thanks to Juan Grigera. addedd in support for extra stem methods

File:

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

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

@@ -210 +210 @@
               vector<unsigned long> &equivWords) {
   equivWords.erase (equivWords.begin(), equivWords.end());
-  
-  if (stemMethod == 0 || stemMethod==4 || stemMethod==5) {
+
+  /* [JFG - Mar 06: Accent folding patch] */
+  /* use flag PARTIAL_MATCH */  
+  if (stemMethod == 0 || (stemMethod & STEM_PARTIAL_MATCH)) {
     // don't need to stem the word,
     // find the word number(s) for this term
@@ -218 +220 @@
     word_block_dict_el wordDictEl;
     wordDictEl.SetNumLevels (numLevels);
-    if (stemMethod ==0) {
+    if (stemMethod == 0) {
       if (SearchWordBlockDictEl (indexData.dictFile, indexData.biWords,
                  indexData.bdh.entries_per_wblk,
@@ -228 +230 @@
     } else {
       // partial matching,
-      PartialMatchSearchWordBlockDictEl (indexData.dictFile, indexData.biWords, indexData.bdh.entries_per_wblk, indexData.bdh.word_dict_size, numLevels, term, wordDictEl, equivWords, (stemMethod==5?true:false) );
+      PartialMatchSearchWordBlockDictEl (indexData.dictFile, indexData.biWords, indexData.bdh.entries_per_wblk, indexData.bdh.word_dict_size, numLevels, term, wordDictEl, equivWords, 
+            (stemMethod & STEM_CaseFolding)? true : false);
+            // TODO: Accent Folding is not handled here!!
       return;
     }
@@ -234 +238 @@
               
   // need to stem this word and find it in the blocked stem index
-  
   unsigned char  mgWord[MAXSTEMLEN + 1];
   UCArray stemTerm;
   unsigned long stemmerNum = 0;
-  if (stemMethod == 1) stemmerNum = indexData.sih1.stemmer_num;
-  else if (stemMethod == 2) stemmerNum = indexData.sih2.stemmer_num;
-  else if (stemMethod == 3) stemmerNum = indexData.sih3.stemmer_num;
-   
+
+  /* [JFG - Mar 06: Accent folding patch] */
+  if(stemMethod > STEM_MAX) {
+    return;
+    //TODO: throw an error here
+  }
+  stemmerNum = indexData.sih[stemMethod-1].stemmer_num;
+  
   // convert the word to an "mg word"
   mgWord[0] = term.size();
@@ -247 +254 @@
   
   // stem the word
-  stemmer (stemMethod, stemmerNum, mgWord);
-
+  mgpp_stemmer (stemMethod, stemmerNum, mgWord);
   // convert the result back to a UCArray
   stemTerm.insert (stemTerm.end(), &mgWord[1], &mgWord[1] + mgWord[0]);
@@ -256 +262 @@
   unsigned long stemElNum;
   bool result = false;
-  if (stemMethod == 1) {
-    result = SearchStemBlockDictEl (indexData.stem1File,
-               indexData.sii1,
-               indexData.sih1.entries_per_block,
-               indexData.sih1.dict_size,
+  
+  /* [JFG - Mar 06: Accent folding patch] */
+  result = SearchStemBlockDictEl (indexData.stemFile[stemMethod-1],
+               indexData.sii[stemMethod-1],
+               indexData.sih[stemMethod-1].entries_per_block,
+               indexData.sih[stemMethod-1].dict_size,
                stemTerm,
                stemDictEl,
                stemElNum);
-
-  } else if (stemMethod == 2) {
-    result = SearchStemBlockDictEl (indexData.stem2File,
-               indexData.sii2,
-               indexData.sih2.entries_per_block,
-               indexData.sih2.dict_size,
-               stemTerm,
-               stemDictEl,
-               stemElNum);
-
-  } else if (stemMethod == 3) {
-    result = SearchStemBlockDictEl (indexData.stem3File,
-               indexData.sii3,
-               indexData.sih3.entries_per_block,
-               indexData.sih3.dict_size,
-               stemTerm,
-               stemDictEl,
-               stemElNum);
-  }
-
+  
   if (result) {
     equivWords = stemDictEl.equivWords;