Changeset 26137 for main/trunk/greenstone2/common-src/indexers

Timestamp:

2012-08-30T12:45:08+12:00 (12 years ago)

Author:

kjdon

Message:

FindWordNumbers was doing a test to see if the appropriate stem index was built. eg if you ask for a casefolded search but there was no casefolded index built, then you can't do it, so set the stemMethod to 0, which means no stem/casefolding/accentfolding. Unfortunately, if the stemMethod was 0, then it was looking up an array at 0-1, which is some huge number (stem method is mg_u_long). For some reason, this didn't cause a seg fault on 32 bit machines, but did on 64 bit machines which is where the bug showed up. So we must test for stem method being 0 before looking into the stem file array

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/text/Terms.cpp (modified) (2 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/text/Terms.cpp

@@ -213 +213 @@
   // if the stem method specified is not a valid one (i.e. there was no appropriate stem index, then we set it to 0)
   // unless we have partial matching, in which case we are not doing stem indexes anyway.
-  if (!(stemMethod & STEM_PARTIAL_MATCH) && indexData.stemFile[stemMethod-1] == NULL) {
-    cerr << "Stem index for method "<<stemMethod<< " was not built, so not doing stemming\n";
-    stemMethod = 0;
+
+  if (!(stemMethod & STEM_PARTIAL_MATCH)) {
+
+    if(stemMethod > STEM_MAX) {
+      cerr << "Stem method "<<stemMethod<< " is greater than maximum allowed ("<<STEM_MAX<<"). Not doing stemming\n";
+      stemMethod=0;
+    }
+    else if (stemMethod > 0 && indexData.stemFile[stemMethod-1] == NULL) {
+      cerr << "Stem index for method "<<stemMethod<< " was not built, so not doing stemming\n";
+      stemMethod = 0;
+    }
   }
   /* [JFG - Mar 06: Accent folding patch] */
@@ -247 +255 @@
   mg_u_long stemmerNum = 0;
 
-  /* [JFG - Mar 06: Accent folding patch] */
-  if(stemMethod > STEM_MAX) {
-    return;
-    //TODO: throw an error here
-  }
 
   stemmerNum = indexData.sih[stemMethod-1].stemmer_num;