X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamb%2Ftstisamb.c;h=17f2a3889abc3992e13de7b78c2eee70ed5b4b4c;hb=7932a969b3849997dfc607686b19fab1637cd26e;hp=e3eebbbc045f9dced874655be42a3c5f209f4b26;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git

diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c
index e3eebbb..17f2a38 100644
--- a/isamb/tstisamb.c
+++ b/isamb/tstisamb.c
@@ -1,5 +1,5 @@
-/* $Id: tstisamb.c,v 1.10 2004-09-09 10:08:06 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: tstisamb.c,v 1.14 2005-01-02 18:51:31 adam Exp $
+   Copyright (C) 1995-2005
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -21,21 +21,21 @@ 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/xmalloc.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)
@@ -44,7 +44,11 @@ int compare_item(const void *a, const void *b)
 
     memcpy(&ia, a, sizeof(int));
     memcpy(&ib, b, sizeof(int));
-    return ia - ib;
+    if (ia > ib)
+	return 1;
+    if (ia < ib)
+	return -1;
+   return 0;
 }
 
 void *code_start()
@@ -84,67 +88,11 @@ int code_read(void *vp, char **dst, int *insertMode)
     memcpy (*dst, &x, sizeof(int));
     (*dst)+=sizeof(int);
 
-    ri->no += ri->step;
+    ri->no = ri->no + ri->step;
     *insertMode = ri->insertMode;
     return 1;
 }
 
-void tst_forward(ISAMB isb, int n)
-{
-    ISAMC_I isamc_i;
-    ISAMC_P isamc_p;
-    struct read_info ri;
-    int i;
-    ISAMB_PP pp;
-
-    /* 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;
-    
-    isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
-
-    /* read the entries */
-    pp = isamb_pp_open (isb, isamc_p, 2);
-    
-    for (i = 0; i<ri.max; i +=2 )
-    {
-	int x = -1;
-	int xu = i;
-	isamb_pp_forward(pp, &x, &xu);
-	if (x != xu && xu != x+1)
-	{
-	    yaz_log(LOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
-		    x, xu);
-	    exit(4);
-	}
-	ri.no++;
-    }
-    isamb_pp_close(pp);
-    
-    pp = isamb_pp_open (isb, isamc_p, 2);
-    for (i = 0; i<ri.max; i += 100)
-    {
-	int x = -1;
-	int xu = i;
-	isamb_pp_forward(pp, &x, &xu);
-	if (x != xu && xu != x+1)
-	{
-	    yaz_log(LOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
-		    x, xu);
-	    exit(4);
-	}
-	ri.no++;
-    }
-    isamb_pp_close(pp);
-
-    isamb_unlink(isb, isamc_p);
-}
-
 void tst_insert(ISAMB isb, int n)
 {
     ISAMC_I isamc_i;
@@ -152,6 +100,7 @@ void tst_insert(ISAMB isb, int n)
     struct read_info ri;
     ISAMB_PP pp;
     char key_buf[10];
+    int nerrs = 0;
 
     /* insert a number of entries */
     ri.no = 0;
@@ -165,8 +114,8 @@ 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, 2);
-    
+    pp = isamb_pp_open (isb, isamc_p, 1);
+
     ri.no = 0;
     while(isamb_pp_read (pp, key_buf))
     {
@@ -174,21 +123,27 @@ 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)",
-		    x, ri.no);
-	    exit(3);
+	    yaz_log(YLOG_WARN, "isamb_pp_read. n=%d Got %d (expected %d)",
+		    n, x, ri.no);
+	    nerrs++;
 	}
+	else if (nerrs)
+	    yaz_log(YLOG_LOG, "isamb_pp_read. n=%d Got %d",
+		    n, x);
+
 	ri.no++;
     }
     if (ri.no != ri.max)
     {
-	yaz_log(LOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
-	exit(3);
+	yaz_log(YLOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
+	nerrs++;
     }
-    isamb_pp_close(pp);
-
     isamb_dump(isb, isamc_p, log_pr);
+    isamb_pp_close(pp);
 
+    if (nerrs)
+        exit(3);
+    return;
     /* delete a number of entries (even ones) */
     ri.no = 0;
     ri.step = 2;
@@ -201,7 +156,7 @@ void tst_insert(ISAMB isb, int n)
     isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
 
     /* delete a number of entries (odd ones) */
-    ri.no = 1;
+    ri.no = 0;
     ri.step = 2;
     ri.max = n;
     ri.insertMode = 0;
@@ -213,11 +168,67 @@ void tst_insert(ISAMB isb, int n)
 
     if (isamc_p)
     {
-	yaz_log(LOG_WARN, "isamb_merge did not return empty list");
+	yaz_log(YLOG_WARN, "isamb_merge did not return empty list");
 	exit(3);
     }
 }
 
+void tst_forward(ISAMB isb, int n)
+{
+    ISAMC_I isamc_i;
+    ISAMC_P isamc_p;
+    struct read_info ri;
+    int i;
+    ISAMB_PP pp;
+
+    /* 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;
+    
+    isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
+
+    /* read the entries */
+    pp = isamb_pp_open (isb, isamc_p, 1);
+    
+    for (i = 0; i<ri.max; i +=2 )
+    {
+	int x = -1;
+	int xu = i;
+	isamb_pp_forward(pp, &x, &xu);
+	if (x != xu && xu != x+1)
+	{
+	    yaz_log(YLOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
+		    x, xu);
+	    exit(4);
+	}
+	ri.no++;
+    }
+    isamb_pp_close(pp);
+    
+    pp = isamb_pp_open (isb, isamc_p, 1);
+    for (i = 0; i<ri.max; i += 100)
+    {
+	int x = -1;
+	int xu = i;
+	isamb_pp_forward(pp, &x, &xu);
+	if (x != xu && xu != x+1)
+	{
+	    yaz_log(YLOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
+		    x, xu);
+	    exit(4);
+	}
+	ri.no++;
+    }
+    isamb_pp_close(pp);
+
+    isamb_unlink(isb, isamc_p);
+}
+
 int main(int argc, char **argv)
 {
     BFiles bfs;
@@ -225,7 +236,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;
@@ -240,7 +251,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);
     }
 
@@ -250,7 +261,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);