Changeset 12885

Timestamp:

2006-09-28T10:56:12+12:00 (18 years ago)

Author:

kjdon

Message:

Accent folding patch thanks to Juan Grigera. now has more options for stem indexes (1-7).

File:

• trunk/gsdl/src/mgpp/text/mgpp_stem_idx.cpp (modified) (4 diffs)

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

@@ -80 +80 @@
 
     // stem the word
-    stemmer (stemMethod, stemmerNum, mgWord);
+    mgpp_stemmer (stemMethod, stemmerNum, mgWord);
 
     // convert the result back to a UCArray
@@ -101 +101 @@
             int stemmerNum,
             unsigned long entriesPerBlock) {
+  
+  /* [JFG - Mar 06: Accent folding patch] */
   // Create appropriate stem index file
   FILE *stemDictFile = NULL;
-  if (stemMethod == 1) {
-    stemDictFile = create_file (filename, INVF_DICT_BLOCKED_1_SUFFIX,
-                "wb", MAGIC_STEM_1, MG_ABORT);
-  } else if (stemMethod == 2) {
-    stemDictFile = create_file (filename, INVF_DICT_BLOCKED_2_SUFFIX,
-                "wb", MAGIC_STEM_2, MG_ABORT);
-  } else if (stemMethod == 3) {
-    stemDictFile = create_file (filename, INVF_DICT_BLOCKED_3_SUFFIX,
-                "wb", MAGIC_STEM_3, MG_ABORT);
-  } else {
+  if (stemMethod >= STEM_MIN && stemMethod <= STEM_MAX) {
+    char *suffix = make_suffix (INVF_DICT_BLOCKED_SUFFIX_PAT, stemMethod, NULL);
+    stemDictFile = create_file (filename, suffix,
+                "wb", MAGIC_STEM_GEN(stemMethod + '0'), MG_ABORT);  
+  }
+  else {
     FatalError (1, "Unknown stem method %d", stemMethod);
   }
@@ -213 +211 @@
       break;
     case 'a':
-      stemmerNum = stemmernumber ((unsigned char *) optarg);
+      stemmerNum = mgpp_stemmernumber ((unsigned char *) optarg);
       break;
     case 'h':
@@ -224 +222 @@
   }
   
-  if (stemMethod < 1 || stemMethod > 3)
-    FatalError (1, "Stem method must be 1, 2 or 3");
+  /* [JFG - Mar 06: Accent folding patch] */
+  if (stemMethod < STEM_MIN || stemMethod > STEM_MAX) 
+    FatalError (1, "Stem method must be between %d and %d", STEM_MIN, STEM_MAX);
 
   // read in the dictionary and create the in memory dictionary