Changeset 12914

Timestamp:

2006-09-28T16:55:54+12:00 (18 years ago)

Author:

kjdon

Message:

allow IndexData to be constructed even if stem indexes are missing - we don't always build all stem indexes anymore. stemFile[stemmethod] will be null if that stem method hasn't been built

File:

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

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

@@ -32 +32 @@
   /* [JFG - Mar 06: Accent folding patch] */
   for(int i=STEM_MIN;i <= STEM_MAX;i++) 
-    stemFile[i-1] = NULL;
+    stemFile[i-1] = NULL;
 
   invfFile = NULL;
@@ -81 +81 @@
   /* [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_ABORT);
-      if (!sih[stem-1].Read (stemFile[stem-1])) { UnloadData (); return false; }
-    
-      fseek (stemFile[stem-1], sih[stem-1].block_idx_start, SEEK_SET);
-      if (!ReadBlockIdx (stemFile[stem-1], sii[stem-1])) { UnloadData (); return false; }
-  }
-
-
+    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",
@@ -114 +126 @@
   }
 
-  for(int i=STEM_MIN;i <= STEM_MAX;i++) 
-      if (stemFile[i-1] != NULL) {
-        fclose (stemFile[i-1]); stemFile[i-1] = NULL;
-      }
+  for(int i=STEM_MIN;i <= STEM_MAX;i++) {
+    if (stemFile[i-1] != NULL) {
+      fclose (stemFile[i-1]); stemFile[i-1] = NULL;
+    }
+  }
 
   if (invfFile != NULL) {