X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=7b7efcaea979265166f733a2edb76d33c5e527bc;hb=1f1106ca4cb980d93dec90480e25df75ddd59c4d;hp=ac8f9cb0e9ee692d7e6db6137d48976f4b8338fe;hpb=647212270fdb2030f6a1ab1f9880874f531847b2;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index ac8f9cb..7b7efca 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.14 2005-04-20 10:18:19 adam Exp $
+/* $Id: testlib.c,v 1.18 2005-05-04 10:50:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -139,8 +139,8 @@ void init_data(ZebraHandle zh, const char **recs)
 
 }
 
-int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
-	      int experror)
+int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
+	       int experror)
 {
     ODR odr;
     YAZ_PQF_Parser parser;
@@ -181,12 +181,14 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
     else
     {
 	if (rc == ZEBRA_FAIL) {
-	    printf("Error: search returned %d\n%s\n", rc, query);
+	    int code = zebra_errCode(zh);
+	    printf("Error: search returned %d. Code %d\n%s\n", rc, 
+		   code, query);
 	    exit (1);
 	}
 	if (exphits != -1 && hits != exphits) {
 	    printf("Error: search returned " ZINT_FORMAT 
-		   " hits instead of %d\n%s\n",
+		   " hits instead of " ZINT_FORMAT "\n%s\n",
 		   hits, exphits, query);
 	    exit (1);
 	}
@@ -196,11 +198,80 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
 }
 
 
-int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
+int do_query(int lineno, ZebraHandle zh, const char *query, zint exphits)
 {
     return do_query_x(lineno, zh, query, exphits, 0);
 }
 
+void do_scan(int lineno, ZebraHandle zh, const char *query,
+	     int pos, int num,
+	     int exp_pos, int exp_num, int exp_partial,
+	     const char **exp_entries)
+{
+    ODR odr = odr_createmem(ODR_ENCODE);
+    ZebraScanEntry *entries = 0;
+    int partial = -123;
+    ZEBRA_RES res;
+
+    yaz_log(log_level, "======================================");
+    yaz_log(log_level, "scan[%d]: pos=%d num=%d %s", lineno, pos, num, query);
+
+    res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial);
+    if (res != ZEBRA_OK)
+    {
+	printf("Error: scan returned %d (FAIL), but no error was expected\n"
+	       "%s\n",  res, query);
+	exit(1);
+    }
+    else
+    {
+	int fails = 0;
+	if (partial == -123)
+	{
+	    printf("Error: scan returned OK, but partial was not set\n"
+		   "%s\n", query);
+	    fails++;
+	}
+	if (partial != exp_partial)
+	{
+	    printf("Error: scan returned OK, with partial/expected %d/%d\n"
+		   "%s\n", partial, exp_partial, query);
+	    fails++;
+	}
+	if (num != exp_num)
+	{
+	    printf("Error: scan returned OK, with num/expected %d/%d\n"
+		   "%s\n", num, exp_num, query);
+	    fails++;
+	}
+	if (pos != exp_pos)
+	{
+	    printf("Error: scan returned OK, with pos/expected %d/%d\n"
+		   "%s\n", pos, exp_pos, query);
+	    fails++;
+	}
+	if (fails)
+	    exit(1);
+	fails = 0;
+	if (exp_entries)
+	{
+	    int i;
+	    for (i = 0; i<num; i++)
+	    {
+		if (strcmp(exp_entries[i], entries[i].term))
+		{
+		    printf("Error: scan OK, but entry %d term/exp %s/%s\n"
+			   "%s\n",
+			   i, entries[i].term, exp_entries[i], query);
+		    fails++;
+		}
+	    }
+	}
+	if (fails)
+	    exit(0);
+    }
+    odr_destroy(odr);
+}
 
 /** 
  * makes a query, checks number of hits, and for the first hit, that 
@@ -233,7 +304,7 @@ void ranking_query(int lineno, ZebraHandle zh, char *query,
     if (!strstr(retrievalRecord[0].buf, firstrec))
     {
         printf("Error: Got the wrong record first\n");
-        printf("Expected '%s' but got \n", firstrec);
+        printf("Expected '%s' but got\n", firstrec);
         printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
         exit(1);
     }
@@ -274,7 +345,7 @@ void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
     {
 	if (meta[i].sysno != ids[i])
 	{
-	    printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT,
+	    printf("Expected id=" ZINT_FORMAT " but got id=" ZINT_FORMAT "\n",
 		   ids[i], meta[i].sysno);
 	    exit(1);
 	}