C++ compilation.

[idzebra-moved-to-github.git] / index / recindex.c

diff --git a/index/recindex.c b/index/recindex.c
index 3e562f4..17e6734 100644 (file)
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -1,10 +1,37 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recindex.c,v $
- * Revision 1.16  1996-06-04 10:19:00  adam
+ * Revision 1.23  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.22  1999/02/18 12:49:34  adam
+ * Changed file naming scheme for register files as well as record
+ * store/index files.
+ *
+ * Revision 1.21  1999/02/02 14:51:03  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.20  1998/01/12 15:04:08  adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.19  1997/09/17 12:19:16  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.18  1997/07/15 16:28:42  adam
+ * Bug fix: storeData didn't work with files with multiple records.
+ * Bug fix: fixed memory management with records; not really well
+ *  thought through.
+ *
+ * Revision 1.17  1997/02/12 20:39:46  adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.16  1996/06/04 10:19:00  adam
  * Minor changes - removed include of ctype.h.
  *
  * Revision 1.15  1996/05/13  14:23:06  adam
@@ -93,12 +120,12 @@ static void rec_write_head (Records p)
 
 static void rec_tmp_expand (Records p, int size, int dst_type)
 {
-    if (p->tmp_size < size + 256 ||
+    if (p->tmp_size < size + 2048 ||
         p->tmp_size < p->head.block_size[dst_type]*2)
     {
         xfree (p->tmp_buf);
-        p->tmp_size = size + p->head.block_size[dst_type]*2 + 256;
-        p->tmp_buf = xmalloc (p->tmp_size);
+        p->tmp_size = size + p->head.block_size[dst_type]*2 + 2048;
+        p->tmp_buf = (char *) xmalloc (p->tmp_size);
     }
 }
 
@@ -113,7 +140,6 @@ static int read_indx (Records p, int sysno, void *buf, int itemsize,
     {
         logf (LOG_FATAL|LOG_ERRNO, "read in %s at pos %ld",
               p->index_fname, (long) pos);
-        abort ();
         exit (1);
     }
     return r;
@@ -217,6 +243,7 @@ static void rec_write_single (Records p, Record rec)
             {
                 logf (LOG_FATAL|LOG_ERRNO, "read in %s at free block %d",
                       p->data_fname[dst_type], block_free);
+               exit (1);
             }
         }
         else
@@ -251,17 +278,17 @@ static void rec_update_single (Records p, Record rec)
     rec_write_single (p, rec);
 }
 
-Records rec_open (int rw)
+Records rec_open (BFiles bfs, int rw)
 {
     Records p;
     int i, r;
 
-    p = xmalloc (sizeof(*p));
+    p = (Records) xmalloc (sizeof(*p));
     p->rw = rw;
     p->tmp_size = 1024;
-    p->tmp_buf = xmalloc (p->tmp_size);
-    p->index_fname = "recindex";
-    p->index_BFile = bf_open (p->index_fname, 128, rw);
+    p->tmp_buf = (char *) xmalloc (p->tmp_size);
+    p->index_fname = "reci";
+    p->index_BFile = bf_open (bfs, p->index_fname, 128, rw);
     if (p->index_BFile == NULL)
     {
         logf (LOG_FATAL|LOG_ERRNO, "open %s", p->index_fname);
@@ -304,14 +331,14 @@ Records rec_open (int rw)
     for (i = 0; i<REC_BLOCK_TYPES; i++)
     {
         char str[80];
-        sprintf (str, "recdata%c", i + 'A');
-        p->data_fname[i] = xmalloc (strlen(str)+1);
+        sprintf (str, "recd%c", i + 'A');
+        p->data_fname[i] = (char *) xmalloc (strlen(str)+1);
         strcpy (p->data_fname[i], str);
         p->data_BFile[i] = NULL;
     }
     for (i = 0; i<REC_BLOCK_TYPES; i++)
     {
-        if (!(p->data_BFile[i] = bf_open (p->data_fname[i],
+        if (!(p->data_BFile[i] = bf_open (bfs, p->data_fname[i],
                                           p->head.block_size[i],
                                           rw)))
         {
@@ -321,7 +348,8 @@ Records rec_open (int rw)
     }
     p->cache_max = 10;
     p->cache_cur = 0;
-    p->record_cache = xmalloc (sizeof(*p->record_cache)*p->cache_max);
+    p->record_cache = (struct record_cache_entry *)
+       xmalloc (sizeof(*p->record_cache)*p->cache_max);
     return p;
 }
 
@@ -453,7 +481,7 @@ Record rec_get (Records p, int sysno)
 
     assert (freeblock > 0);
     
-    rec = xmalloc (sizeof(*rec));
+    rec = (Record) xmalloc (sizeof(*rec));
     rec_tmp_expand (p, entry.size, dst_type);
 
     cptr = p->tmp_buf;
@@ -480,7 +508,7 @@ Record rec_get (Records p, int sysno)
         nptr += sizeof(*rec->size);
         if (rec->size[i])
         {
-            rec->info[i] = xmalloc (rec->size[i]);
+            rec->info[i] = (char *) xmalloc (rec->size[i]);
             memcpy (rec->info[i], nptr, rec->size[i]);
             nptr += rec->size[i];
         }
@@ -497,8 +525,8 @@ Record rec_new (Records p)
     Record rec;
 
     assert (p);
-    rec = xmalloc (sizeof(*rec));
-    if (p->head.index_free == 0)
+    rec = (Record) xmalloc (sizeof(*rec));
+    if (1 || p->head.index_free == 0)
         sysno = (p->head.index_last)++;
     else
     {
@@ -571,7 +599,7 @@ Record rec_cp (Record rec)
     Record n;
     int i;
 
-    n = xmalloc (sizeof(*n));
+    n = (Record) xmalloc (sizeof(*n));
     n->sysno = rec->sysno;
     for (i = 0; i < REC_NO_INFO; i++)
         if (!rec->info[i])
@@ -582,7 +610,7 @@ Record rec_cp (Record rec)
         else
         {
             n->size[i] = rec->size[i];
-            n->info[i] = xmalloc (rec->size[i]);
+            n->info[i] = (char *) xmalloc (rec->size[i]);
             memcpy (n->info[i], rec->info[i], rec->size[i]);
         }
     return n;
@@ -599,7 +627,7 @@ char *rec_strdup (const char *s, size_t *len)
         return NULL;
     }
     *len = strlen(s)+1;
-    p = xmalloc (*len);
+    p = (char *) xmalloc (*len);
     strcpy (p, s);
     return p;
 }