X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamb%2Ftstisamb.c;h=5f471cdcf069321b479582000b19e91c20dd0e13;hb=3e8db66d56c466a5a269362eb70b4931d9579128;hp=253bc1ff54cba8b6bba915867371f588a5f46ce0;hpb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;p=idzebra-moved-to-github.git

diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c
index 253bc1f..5f471cd 100644
--- a/isamb/tstisamb.c
+++ b/isamb/tstisamb.c
@@ -1,4 +1,4 @@
-/* $Id: tstisamb.c,v 1.7 2004-08-03 14:54:41 heikki Exp $
+/* $Id: tstisamb.c,v 1.9 2004-08-23 13:06:46 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -47,12 +47,12 @@ int compare_item(const void *a, const void *b)
     return ia - ib;
 }
 
-void *code_start(int mode)
+void *code_start()
 {
     return 0;
 }
 
-void code_item(int mode, void *p, char **dst, char **src)
+void code_item(void *p, char **dst, const char **src)
 {
     memcpy (*dst, *src, sizeof(int));
     (*dst) += sizeof(int);
@@ -62,13 +62,15 @@ void code_item(int mode, void *p, char **dst, char **src)
 void code_reset(void *p)
 {
 }
-void code_stop(int mode, void *p)
+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;
@@ -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;
@@ -184,7 +188,34 @@ void tst_insert(ISAMB isb, int n)
     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(LOG_WARN, "isamb_merge did not return empty list");
+	exit(3);
+    }
 }
 
 int main(int argc, char **argv)
@@ -199,10 +230,11 @@ int main(int argc, char **argv)
     /* setup method (attributes) */
     method.compare_item = compare_item;
     method.log_item = log_item;
-    method.code_start = code_start;
-    method.code_item = code_item;
-    method.code_reset = code_reset;
-    method.code_stop = code_stop;
+    method.codec.start = code_start;
+    method.codec.encode = code_item;
+    method.codec.decode = code_item;
+    method.codec.reset = code_reset;
+    method.codec.stop = code_stop;
 
     /* create block system */
     bfs = bfs_create(0, 0);