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

diff --git a/test/api/testlib.c b/test/api/testlib.c
index d54c7c1..94554a2 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.12 2005-03-09 12:14:42 adam Exp $
+/* $Id: testlib.c,v 1.13 2005-04-15 10:47:49 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -120,38 +120,38 @@ void init_data(ZebraHandle zh, const char **recs)
     zebra_select_database(zh, "Default");
     yaz_log(log_level, "going to call init");
     i = zebra_init(zh);
-    yaz_log(log_level, "init returned %d",i);
+    yaz_log(log_level, "init returned %d", i);
     if (i) 
     {
         printf("init failed with %d\n",i);
         zebra_result(zh, &i, &addinfo);
-        printf("  Error %d   %s\n",i,addinfo);
+        printf("  Error %d   %s\n", i, addinfo);
         exit(1);
     }
     if (recs)
     {
         zebra_begin_trans (zh, 1);
         for (i = 0; recs[i]; i++)
-            zebra_add_record (zh, recs[i], strlen(recs[i]));
-        zebra_end_trans (zh);
-        zebra_commit (zh);
+            zebra_add_record(zh, recs[i], strlen(recs[i]));
+        zebra_end_trans(zh);
+        zebra_commit(zh);
     }
 
 }
 
-int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
+int do_query_x(int lineno, ZebraHandle zh, char *query, int exphits,
+	      int experror)
 {
     ODR odr;
     YAZ_PQF_Parser parser;
     Z_RPNQuery *rpn;
     const char *setname="rsetname";
     zint hits;
-    int rc;
-        
+    ZEBRA_RES rc;
 
-    yaz_log(log_level,"======================================");
-    yaz_log(log_level,"qry[%d]: %s", lineno, query);
-    odr=odr_createmem (ODR_DECODE);    
+    yaz_log(log_level, "======================================");
+    yaz_log(log_level, "qry[%d]: %s", lineno, query);
+    odr = odr_createmem (ODR_DECODE);    
 
     parser = yaz_pqf_create();
     rpn = yaz_pqf_parse(parser, odr, query);
@@ -159,16 +159,36 @@ int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
         printf("Error: Parse failed \n%s\n",query);
         exit(1);
     }
-    rc = zebra_search_RPN (zh, odr, rpn, setname, &hits);
-    if (rc) {
-        printf("Error: search returned %d \n%s\n",rc,query);
-        exit (1);
+    rc = zebra_search_RPN(zh, odr, rpn, setname, &hits);
+    if (experror)
+    {
+	if (rc != ZEBRA_FAIL)
+	{
+	    printf("Error: search returned %d (OK), but error was expected\n"
+		   "%s\n",  rc, query);
+	    exit(1);
+	}
+	int code = zebra_errCode(zh);
+	if (code != experror)
+	{
+	    printf("Error: search returned error code %d, but error %d was "
+		   "expected\n%s\n",
+		   code, experror, query);
+	    exit(1);
+	}
     }
-
-    if (hits != exphits) {
-        printf("Error: search returned " ZINT_FORMAT " hits instead of %d\n",
-                hits, exphits);
-        exit (1);
+    else
+    {
+	if (rc == ZEBRA_FAIL) {
+	    printf("Error: search returned %d\n%s\n", rc, query);
+	    exit (1);
+	}
+	if (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);
@@ -176,12 +196,18 @@ int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
 }
 
 
+int do_query(int lineno, ZebraHandle zh, char *query, int exphits)
+{
+    return do_query_x(lineno, zh, query, exphits, 0);
+}
+
+
 /** 
  * makes a query, checks number of hits, and for the first hit, that 
  * it contains the given string, and that it gets the right score
  */
 void ranking_query(int lineno, ZebraHandle zh, char *query, 
-          int exphits, char *firstrec, int firstscore )
+		   int exphits, char *firstrec, int firstscore)
 {
     ZebraRetrievalRecord retrievalRecord[10];
     ODR odr_output = odr_createmem (ODR_ENCODE);    
@@ -207,8 +233,8 @@ 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("%.*s\n",retrievalRecord[0].len,retrievalRecord[0].buf);
+        printf("Expected '%s' but got \n", firstrec);
+        printf("%.*s\n", retrievalRecord[0].len, retrievalRecord[0].buf);
         exit(1);
     }