Improved installation. Updated for inclusion of YAZ header files.

[idzebra-moved-to-github.git] / isamc / isamc.c

diff --git a/isamc/isamc.c b/isamc/isamc.c
index 10bfc52..28b71ce 100644 (file)
--- a/isamc/isamc.c
+++ b/isamc/isamc.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: isamc.c,v $
- * Revision 1.15  1998-05-20 10:12:25  adam
+ * Revision 1.20  1999-11-30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.19  1999/07/14 10:59:27  adam
+ * Changed functions isc_getmethod, isams_getmethod.
+ * Improved fatal error handling (such as missing EXPLAIN schema).
+ *
+ * Revision 1.18  1999/06/30 09:08:23  adam
+ * Added coder to reset.
+ *
+ * Revision 1.17  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.16  1998/05/27 14:32:03  adam
+ * Changed default block category layout.
+ *
+ * Revision 1.15  1998/05/20 10:12:25  adam
  * Implemented automatic EXPLAIN database maintenance.
  * Modified Zebra to work with ASN.1 compiled version of YAZ.
  *
@@ -71,7 +87,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <log.h>
+#include <yaz/log.h>
 #include "isamc-p.h"
 
 static void flush_block (ISAMC is, int cat);
@@ -82,38 +98,36 @@ static void init_fc (ISAMC is, int cat);
 
 #define SMALL_TEST 0
 
-ISAMC_M isc_getmethod (void)
+void isc_getmethod (ISAMC_M m)
 {
+
     static struct ISAMC_filecat_s def_cat[] = {
 #if SMALL_TEST
         {    32,     28,      0,  3 },
        {    64,     54,     30,  0 },
 #else
-        {    32,     28,     20,  7  },
-       {   128,    120,    100,  8  },
-        {   512,    490,    350,  9  },
+        {    24,     22,     18,  10 },
+       {   128,    120,    100,  10 },
+        {   512,    490,    350,  10 },
         {  2048,   1900,   1700,  10 },
         {  8192,   8000,   7900,  10 },
         { 32768,  32000,  31000,  0 },
 #endif
     };
-    ISAMC_M m = xmalloc (sizeof(*m));
     m->filecat = def_cat;
 
     m->code_start = NULL;
     m->code_item = NULL;
     m->code_stop = NULL;
+    m->code_reset = NULL;
 
     m->compare_item = NULL;
 
     m->debug = 1;
 
     m->max_blocks_mem = 10;
-
-    return m;
 }
 
-
 ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
 {
     ISAMC is;
@@ -121,9 +135,9 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
     int i = 0;
     int max_buf_size = 0;
 
-    is = xmalloc (sizeof(*is));
+    is = (ISAMC) xmalloc (sizeof(*is));
 
-    is->method = xmalloc (sizeof(*is->method));
+    is->method = (ISAMC_M) xmalloc (sizeof(*is->method));
     memcpy (is->method, method, sizeof(*method));
     filecat = is->method->filecat;
     assert (filecat);
@@ -150,10 +164,10 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
         logf (LOG_LOG, "isc: max_buf_size %d", max_buf_size);
     
     assert (is->no_files > 0);
-    is->files = xmalloc (sizeof(*is->files)*is->no_files);
+    is->files = (ISAMC_file) xmalloc (sizeof(*is->files)*is->no_files);
     if (writeflag)
     {
-        is->merge_buf = xmalloc (max_buf_size+256);
+        is->merge_buf = (char *) xmalloc (max_buf_size+256);
        memset (is->merge_buf, 0, max_buf_size+256);
     }
     else
@@ -175,7 +189,8 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
        is->files[i].alloc_entries_num = 0;
        is->files[i].alloc_entries_max =
            is->method->filecat[i].bsize / sizeof(int) - 1;
-       is->files[i].alloc_buf = xmalloc (is->method->filecat[i].bsize);
+       is->files[i].alloc_buf = (char *)
+           xmalloc (is->method->filecat[i].bsize);
         is->files[i].no_writes = 0;
         is->files[i].no_reads = 0;
         is->files[i].no_skip_writes = 0;
@@ -460,7 +475,8 @@ static void init_fc (ISAMC is, int cat)
     int j = 100;
         
     is->files[cat].fc_max = j;
-    is->files[cat].fc_list = xmalloc (sizeof(*is->files[0].fc_list) * j);
+    is->files[cat].fc_list = (int *)
+       xmalloc (sizeof(*is->files[0].fc_list) * j);
     while (--j >= 0)
         is->files[cat].fc_list[j] = 0;
 }
@@ -488,13 +504,13 @@ void isc_pp_close (ISAMC_PP pp)
 
 ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
 {
-    ISAMC_PP pp = xmalloc (sizeof(*pp));
+    ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp));
     char *src;
    
     pp->cat = isc_type(ipos);
     pp->pos = isc_block(ipos); 
 
-    src = pp->buf = xmalloc (is->method->filecat[pp->cat].bsize);
+    src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize);
 
     pp->next = 0;
     pp->size = 0;