Changeset 13477 for trunk/indexers/mgpp/text/IndexData.cpp

Timestamp:

2006-12-11T11:22:20+13:00 (17 years ago)

Author:

shaoqun

Message:

added code for accentfolding

File:

• trunk/indexers/mgpp/text/IndexData.cpp (modified) (3 diffs)

trunk/indexers/mgpp/text/IndexData.cpp

@@ -30 +30 @@
   dictFile = NULL;
 
-  stem1File = NULL;
-  stem2File = NULL;
-  stem3File = NULL;
+  /* [JFG - Mar 06: Accent folding patch] */
+  for(int i=STEM_MIN;i <= STEM_MAX;i++) 
+    stemFile[i-1] = NULL;
 
   invfFile = NULL;
@@ -79 +79 @@
   if (!ReadBlockIdx (dictFile, biTags)) { UnloadData (); return false; }
 
-  // blocked stem index 1
-  stem1File = open_file (filename, INVF_DICT_BLOCKED_1_SUFFIX,
-             "rb", MAGIC_STEM_1, MG_ABORT);
-  if (!sih1.Read (stem1File)) { UnloadData (); return false; }
-
-  fseek (stem1File, sih1.block_idx_start, SEEK_SET);
-  if (!ReadBlockIdx (stem1File, sii1)) { UnloadData (); return false; }
-  
-  // blocked stem index 2
-  stem2File = open_file (filename, INVF_DICT_BLOCKED_2_SUFFIX,
-             "rb", MAGIC_STEM_2, MG_ABORT);
-  if (!sih2.Read (stem2File)) { UnloadData (); return false; }
-
-  fseek (stem2File, sih2.block_idx_start, SEEK_SET);
-  if (!ReadBlockIdx (stem2File, sii2)) { UnloadData (); return false; }
-  
-  // blocked stem index 3
-  stem3File = open_file (filename, INVF_DICT_BLOCKED_3_SUFFIX,
-             "rb", MAGIC_STEM_3, MG_ABORT);
-  if (!sih3.Read (stem3File)) { UnloadData (); return false; }
-
-  fseek (stem3File, sih3.block_idx_start, SEEK_SET);
-  if (!ReadBlockIdx (stem3File, sii3)) { UnloadData (); return false; }
-
+  /* [JFG - Mar 06: Accent folding patch] */
+  // read stem indexes
+  // [KJD - optional stemming patch]
+  // allow no stem indexes
+  for(int stem = STEM_MIN; stem <= STEM_MAX; stem++) { 
+    char *suffix = make_suffix (INVF_DICT_BLOCKED_SUFFIX_PAT, stem, NULL);
+    stemFile[stem-1] = open_file (filename, suffix,
+                  "rb", MAGIC_STEM_GEN(stem + '0'), MG_MESSAGE);
+    if (stemFile[stem-1]!= NULL) {
+      if (!sih[stem-1].Read (stemFile[stem-1])) { 
+    fclose (stemFile[stem-1]);
+    stemFile[stem-1] = NULL;
+    //UnloadData (); return false; 
+      }
+      
+      fseek (stemFile[stem-1], sih[stem-1].block_idx_start, SEEK_SET);
+      if (!ReadBlockIdx (stemFile[stem-1], sii[stem-1])) { 
+    fclose (stemFile[stem-1]);
+    stemFile[stem-1] = NULL;
+    //UnloadData (); return false; 
+      }
+    }
+  }
+  
+  
   // inverted file
   invfFile = open_file (filename, INVF_SUFFIX, "rb",
@@ -125 +126 @@
   }
 
-  if (stem1File != NULL) {
-    fclose (stem1File); stem1File = NULL;
-  }
-  if (stem2File != NULL) {
-    fclose (stem2File); stem2File = NULL;
-  }
-  if (stem3File != NULL) {
-    fclose (stem3File); stem3File = NULL;
+  for(int i=STEM_MIN;i <= STEM_MAX;i++) {
+    if (stemFile[i-1] != NULL) {
+      fclose (stemFile[i-1]); stemFile[i-1] = NULL;
+    }
   }