X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2Fisam.c;h=362932c17c89f504637442568560b0c954d03a76;hb=5260b5390d8a1a36c66e52083e8ebb9d26b49f01;hp=d2edbbe01b90a5b0089ec320a34312f136386985;hpb=288e50e499479a436edb71358c51fb8317c26da3;p=idzebra-moved-to-github.git

diff --git a/isam/isam.c b/isam/isam.c
index d2edbbe..362932c 100644
--- a/isam/isam.c
+++ b/isam/isam.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: isam.c,v $
- * Revision 1.19  1996-02-10 12:20:56  quinn
+ * Revision 1.24  1997-10-27 14:25:39  adam
+ * Fixed memory leaks.
+ *
+ * Revision 1.23  1997/09/17 12:19:20  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.22  1996/10/29 13:56:53  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.21  1996/03/29 14:11:47  quinn
+ * Change to is_merge
+ *
+ * Revision 1.20  1996/03/19  13:14:57  quinn
+ * Moved an xfree()
+ *
+ * Revision 1.19  1996/02/10  12:20:56  quinn
  * *** empty log message ***
  *
  * Revision 1.18  1996/02/06  10:19:56  quinn
@@ -67,10 +83,9 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <bfile.h>
 #include <isam.h>
-#include <common.h>
 #include "isutil.h"
 #include "rootblk.h"
 #include "keyops.h"
@@ -140,8 +155,9 @@ static int splitargs(const char *s, char *bf[], int max)
  * Open isam file.
  * Process resources.
  */
-ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
-    int writeflag, int keysize)
+ISAM is_open(BFiles bfs, const char *name,
+	     int (*cmp)(const void *p1, const void *p2),
+	     int writeflag, int keysize, Res res)
 {
     ISAM new;
     char *nm, *r, *pp[IS_MAX_BLOCKTYPES+1], m[2];
@@ -172,8 +188,9 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
 	new->types[i].index = 0;                        /* dummy */
 
     /* determine number and size of blocktypes */
-    if (!(r = res_get_def(common_resource, nm = strconcat(name, ".",
-	"blocktypes", 0), "64 512 4K 32K")) ||
+    if (!(r = res_get_def(res,
+			  nm = strconcat(name, ".",
+					 "blocktypes", 0), "64 512 4K 32K")) ||
 	!(num = splitargs(r, pp, IS_MAX_BLOCKTYPES)))
     {
     	logf (LOG_FATAL, "Failed to locate resource %s", nm);
@@ -204,7 +221,7 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
 	new->types[i].dbuf = xmalloc(new->types[i].blocksize);
 	m[0] = 'A' + i;
 	m[1] = '\0';
-	if (!(new->types[i].bf = bf_open(strconcat(name, m, 0), 
+	if (!(new->types[i].bf = bf_open(bfs, strconcat(name, m, 0), 
 	    new->types[i].blocksize, writeflag)))
 	{
 	    logf (LOG_FATAL, "bf_open failed");
@@ -236,9 +253,8 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
         new->keysize = keysize;
     else
     {
-        if (!(r = res_get_def(common_resource, nm = strconcat(name, ".",
-                                                              "keysize",
-                                                              0), "4")))
+        if (!(r = res_get_def(res, nm = strconcat(name, ".",
+						  "keysize", 0), "4")))
         {
             logf (LOG_FATAL, "Failed to locate resource %s", nm);
             return 0;
@@ -251,8 +267,8 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
     }
 
     /* determine repack percent */
-    if (!(r = res_get_def(common_resource, nm = strconcat(name, ".", "repack",
-    	0), IS_DEF_REPACK_PERCENT)))
+    if (!(r = res_get_def(res, nm = strconcat(name, ".", "repack",
+					      0), IS_DEF_REPACK_PERCENT)))
     {
     	logf (LOG_FATAL, "Failed to locate resource %s", nm);
     	return 0;
@@ -260,9 +276,10 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
     new->repack = atoi(r);
 
     /* determine max keys/blocksize */
-    if (!(r = res_get_def(common_resource, nm = strconcat(name, ".",
-	"maxkeys", 0), "50 640 10000")) || !(num = splitargs(r, pp,
-	IS_MAX_BLOCKTYPES)))
+    if (!(r = res_get_def(res,
+			  nm = strconcat(name, ".",
+					 "maxkeys", 0), "50 640 10000")) ||
+	!(num = splitargs(r, pp, IS_MAX_BLOCKTYPES)))
     {
     	logf (LOG_FATAL, "Failed to locate resource %s", nm);
     	return 0;
@@ -303,9 +320,10 @@ ISAM is_open(const char *name, int (*cmp)(const void *p1, const void *p2),
     }
 
     /* determine nice fill rates */
-    if (!(r = res_get_def(common_resource, nm = strconcat(name, ".",
-	"nicefill", 0), "90 90 90 95")) || !(num = splitargs(r, pp,
-	IS_MAX_BLOCKTYPES)))
+    if (!(r = res_get_def(res,
+			  nm = strconcat(name, ".",
+					 "nicefill", 0), "90 90 90 95")) ||
+	!(num = splitargs(r, pp, IS_MAX_BLOCKTYPES)))
     {
     	logf (LOG_FATAL, "Failed to locate resource %s", nm);
     	return 0;
@@ -360,7 +378,9 @@ int is_close(ISAM is)
 	    bf_close(is->types[i].bf);
 	}
     }
-    xfree(is);
+    for (i = 0; i < is->num_types; i++)
+	xfree (is->types[i].dbuf);
+
     if (is->writeflag)
     {
 	logf(LOG_LOG, "ISAM statistics:");
@@ -383,6 +403,7 @@ int is_close(ISAM is)
 	logf(LOG_LOG, "block_jumps                 %d", statistics.block_jumps);
 	logf(LOG_LOG, "tab_deletes                 %d", statistics.tab_deletes);
     }
+    xfree(is);
     return 0;
 }
 
@@ -473,9 +494,8 @@ ISAM_P is_merge(ISAM is, ISAM_P pos, int num, char *data)
 		    	continue;
 		    }
 		    /* else check if next key can fit in this position */
-		    is_m_peek_record(&tab, keybuf);
-		    res = (*is->cmp)(data + 1, keybuf);
-		    if (res < 0)
+		    if (is_m_peek_record(&tab, keybuf) &&
+			(*is->cmp)(data + 1, keybuf) < 0)
 		    {
 		        logf (LOG_DEBUG, "XXReplacing record.");
 		    	is_m_replace_record(&tab, data + 1);