X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=8a32b05d6b72e72c91c8f48346d9633ff27cf280;hb=f24d7d2fd56ec639ccd0d9c2f9628964ef72c078;hp=94554a2788d7e3691419a9e8afbc902db2e5c9db;hpb=49d0ee122a9f86ec2967b577dcc297c501785edd;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 94554a2..8a32b05 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.13 2005-04-15 10:47:49 adam Exp $
+/* $Id: testlib.c,v 1.16 2005-05-02 09:05:22 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -155,8 +155,9 @@ int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
 
     parser = yaz_pqf_create();
     rpn = yaz_pqf_parse(parser, odr, query);
+    yaz_pqf_destroy(parser);
     if (!rpn) {
-        printf("Error: Parse failed \n%s\n",query);
+        printf("Error: Parse failed \n%s\n", query);
         exit(1);
     }
     rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
@@ -180,17 +181,18 @@ 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 (hits != exphits) {
+	if (exphits != -1 && hits != exphits) {
 	    printf("Error: search returned " ZINT_FORMAT 
 		   " hits instead of %d\n%s\n",
 		   hits, exphits, query);
 	    exit (1);
 	}
     }
-    yaz_pqf_destroy(parser);
     odr_destroy (odr);
     return hits;
 }
@@ -201,6 +203,75 @@ int do_query(int lineno, ZebraHandle zh, char *query, int 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