X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamb%2Ftstisamb.c;h=1eb402ca08cbe24b6742886f0a330fa2f82ef641;hp=3ea1d926c56e780be4df886094d1d427498629e8;hb=0e56fa84bb4a5985c19a21926e86862c08d84689;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;ds=sidebyside

diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c
index 3ea1d92..1eb402c 100644
--- a/isamb/tstisamb.c
+++ b/isamb/tstisamb.c
@@ -1,4 +1,4 @@
-/* $Id: tstisamb.c,v 1.8 2004-08-04 08:35:24 adam Exp $
+/* $Id: tstisamb.c,v 1.12 2004-12-08 14:02:37 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -22,20 +22,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <string.h>
 #include <yaz/xmalloc.h>
-#include <yaz/log.h>
-#include <isamb.h>
+#include <yaz/ylog.h>
+#include <idzebra/isamb.h>
 #include <assert.h>
 
 static void log_item(int level, const void *b, const char *txt)
 {
     int x;
     memcpy(&x, b, sizeof(int));
-    yaz_log(LOG_DEBUG, "%s %d", txt, x);
+    yaz_log(YLOG_DEBUG, "%s %d", txt, x);
 }
 
 static void log_pr(const char *txt)
 {
-    yaz_log(LOG_DEBUG, "%s", txt);
+    yaz_log(YLOG_DEBUG, "%s", txt);
 }
 
 int compare_item(const void *a, const void *b)
@@ -68,7 +68,9 @@ void code_stop(void *p)
 
 struct read_info {
     int no;
+    int step;
     int max;
+    int insertMode;
 };
 
 int code_read(void *vp, char **dst, int *insertMode)
@@ -76,16 +78,14 @@ int code_read(void *vp, char **dst, int *insertMode)
     struct read_info *ri = (struct read_info *)vp;
     int x;
 
-    if (ri->no > ri->max)
-	exit(3);
-    if (ri->no == ri->max)
+    if (ri->no >= ri->max)
 	return 0;
     x = ri->no;
     memcpy (*dst, &x, sizeof(int));
     (*dst)+=sizeof(int);
 
-    (ri->no)++;
-    *insertMode = 1;
+    ri->no += ri->step;
+    *insertMode = ri->insertMode;
     return 1;
 }
 
@@ -99,7 +99,9 @@ void tst_forward(ISAMB isb, int n)
 
     /* insert a number of entries */
     ri.no = 0;
+    ri.step = 1;
     ri.max = n;
+    ri.insertMode = 1;
 
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
@@ -107,7 +109,7 @@ void tst_forward(ISAMB isb, int n)
     isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
 
     /* read the entries */
-    pp = isamb_pp_open (isb, isamc_p);
+    pp = isamb_pp_open (isb, isamc_p, 2);
     
     for (i = 0; i<ri.max; i +=2 )
     {
@@ -116,7 +118,7 @@ void tst_forward(ISAMB isb, int n)
 	isamb_pp_forward(pp, &x, &xu);
 	if (x != xu && xu != x+1)
 	{
-	    yaz_log(LOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
+	    yaz_log(YLOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
 		    x, xu);
 	    exit(4);
 	}
@@ -124,7 +126,7 @@ void tst_forward(ISAMB isb, int n)
     }
     isamb_pp_close(pp);
     
-    pp = isamb_pp_open (isb, isamc_p);
+    pp = isamb_pp_open (isb, isamc_p, 2);
     for (i = 0; i<ri.max; i += 100)
     {
 	int x = -1;
@@ -132,7 +134,7 @@ void tst_forward(ISAMB isb, int n)
 	isamb_pp_forward(pp, &x, &xu);
 	if (x != xu && xu != x+1)
 	{
-	    yaz_log(LOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
+	    yaz_log(YLOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
 		    x, xu);
 	    exit(4);
 	}
@@ -153,7 +155,9 @@ void tst_insert(ISAMB isb, int n)
 
     /* insert a number of entries */
     ri.no = 0;
+    ri.step = 1;
     ri.max = n;
+    ri.insertMode = 1;
 
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
@@ -161,7 +165,7 @@ void tst_insert(ISAMB isb, int n)
     isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
 
     /* read the entries */
-    pp = isamb_pp_open (isb, isamc_p);
+    pp = isamb_pp_open (isb, isamc_p, 2);
     
     ri.no = 0;
     while(isamb_pp_read (pp, key_buf))
@@ -170,7 +174,7 @@ void tst_insert(ISAMB isb, int n)
 	memcpy (&x, key_buf, sizeof(int));
 	if (x != ri.no)
 	{
-	    yaz_log(LOG_WARN, "isamb_pp_read. Got %d (expected %d)",
+	    yaz_log(YLOG_WARN, "isamb_pp_read. Got %d (expected %d)",
 		    x, ri.no);
 	    exit(3);
 	}
@@ -178,13 +182,40 @@ void tst_insert(ISAMB isb, int n)
     }
     if (ri.no != ri.max)
     {
-	yaz_log(LOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
+	yaz_log(YLOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
 	exit(3);
     }
     isamb_pp_close(pp);
 
     isamb_dump(isb, isamc_p, log_pr);
-    isamb_unlink(isb, isamc_p);
+
+    /* delete a number of entries (even ones) */
+    ri.no = 0;
+    ri.step = 2;
+    ri.max = n;
+    ri.insertMode = 0;
+
+    isamc_i.clientData = &ri;
+    isamc_i.read_item = code_read;
+    
+    isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
+
+    /* delete a number of entries (odd ones) */
+    ri.no = 1;
+    ri.step = 2;
+    ri.max = n;
+    ri.insertMode = 0;
+
+    isamc_i.clientData = &ri;
+    isamc_i.read_item = code_read;
+    
+    isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
+
+    if (isamc_p)
+    {
+	yaz_log(YLOG_WARN, "isamb_merge did not return empty list");
+	exit(3);
+    }
 }
 
 int main(int argc, char **argv)
@@ -194,7 +225,7 @@ int main(int argc, char **argv)
     ISAMC_M method;
     
     if (argc == 2)
-	yaz_log_init_level(LOG_ALL);
+	yaz_log_init_level(YLOG_ALL);
 	
     /* setup method (attributes) */
     method.compare_item = compare_item;
@@ -209,7 +240,7 @@ int main(int argc, char **argv)
     bfs = bfs_create(0, 0);
     if (!bfs)
     {
-	yaz_log(LOG_WARN, "bfs_create failed");
+	yaz_log(YLOG_WARN, "bfs_create failed");
 	exit(1);
     }
 
@@ -219,7 +250,7 @@ int main(int argc, char **argv)
     isb = isamb_open (bfs, "isamb", 1, &method, 0);
     if (!isb)
     {
-	yaz_log(LOG_WARN, "isamb_open failed");
+	yaz_log(YLOG_WARN, "isamb_open failed");
 	exit(2);
     }
     tst_insert(isb, 1);