Changeset 7582 for trunk/indexers/mg/src/text/ivf.pass1.c

Timestamp:

2004-06-10T15:02:05+12:00 (20 years ago)

Author:

kjdon

Message:

fixed the bug that was causing it not to be able to create a second index using jni - basically had to reset all the static variables at the start of each pass. the tricky thing to find was the static variables in occur_to_lexical in ivf.pass2

File:

• trunk/indexers/mg/src/text/ivf.pass1.c (modified) (7 diffs)

trunk/indexers/mg/src/text/ivf.pass1.c

@@ -45 +45 @@
 /*
    $Log$
+   Revision 1.2  2004/06/10 03:02:05  kjdon
+   fixed the bug that was causing it not to be able to create a second index using jni - basically had to reset all the static variables at the start of each pass. the tricky thing to find was the static variables in occur_to_lexical in ivf.pass2
+
    Revision 1.1  2003/02/20 21:18:23  mdewsnip
    Addition of MG package for search and retrieval
@@ -123 +126 @@
 hash_rec;
 
-
-
-
-
-
-
-
 static unsigned long words_read = 0, words_diff = 0, bytes_diff = 0;
 static unsigned long outputbytes = 0;
@@ -142 +138 @@
 
 static hash_rec **HashTable;
-static unsigned long HashSize;
-static unsigned long HashUsed;
+static unsigned long HashSize=0;
+static unsigned long HashUsed=0;
 static u_char *Pool;
-static int PoolLeft;
+static int PoolLeft=0;
 
 static hash_rec *hr_pool;
-static int hr_PoolLeft;
+static int hr_PoolLeft=0;
 
 static hash_rec **first_occr;
-static int max_first_occr;
+static int max_first_occr=0;
 
 static mg_ullong L1_bits = 0;
@@ -161 +157 @@
 static unsigned long callnum = 0, lcallnum = 0, wordnum = 0, lwordnum = 0;
 static unsigned long ptrcnt = 0;
-static unsigned long checknum;
+static unsigned long checknum=0;
 static long max_mem = 0;
 
@@ -173 +169 @@
 }
 
-
-
+void
+ResetStaticI1Vars () 
+{
+  words_read = 0;
+  words_diff = 0; 
+  bytes_diff = 0;
+  outputbytes = 0;
+  inputbytes = 0;
+  MaxMemInUse = 0;
+  MemInUse = 0;
+  ChunksWritten = 0;
+  
+  HashSize=0;
+  HashUsed=0;
+  PoolLeft=0;
+  
+  hr_PoolLeft=0;
+  
+  max_first_occr=0;
+  
+  L1_bits = 0;
+  L2_bits = 0;
+  L3_bits = 0;
+  L1_ohead = 0;
+  L2_ohead = 0;
+  L3_ohead = 0;
+  callnum = 0;
+  lcallnum = 0;
+  wordnum = 0;
+  lwordnum = 0;
+  ptrcnt = 0;
+  checknum=0;
+  max_mem = 0;
+  
+}
 int 
 init_ivf_1 (char *file_name)
 {
+  ResetStaticI1Vars();
   if (!(ic = create_file (file_name, INVF_CHUNK_SUFFIX, "wb", MAGIC_CHUNK,
               MG_MESSAGE)))  /* [RPAP - Feb 97: WIN32 Port] */
@@ -784 +814 @@
 }
 
-
-
-
 int 
 done_ivf_1 (char *FileName)
@@ -822 +849 @@
   msg_prefix = temp_str;
 
+  /* free the memory */
+  Xfree(HashTable);
+  if (Pool) {
+    Pool -= (POOL_SIZE-PoolLeft);
+    Xfree(Pool);
+  }
+  if (hr_pool) {
+    hr_pool -= (HASH_POOL_SIZE-hr_PoolLeft);
+    Xfree(hr_pool);
+  }
+  if (first_occr) {
+    Xfree(first_occr);
+  }
+
   return (COMPALLOK);
 }               /* done_encode */