X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=1626a61c53f6f51b8ae2cce665c666deaba56eca;hb=4ee6ccf56b9e212a64894ceb919da35a5e94f2a9;hp=3d1f743178fecd23be21221616fbad75d394c0fa;hpb=47eeb5384a8fae8bcac8afb8a84782ca094683f9;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 3d1f743..1626a61 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.23 2005-06-14 20:28:54 adam Exp $
+/* $Id: testlib.c,v 1.28 2005-11-09 12:01:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -94,7 +94,7 @@ const char *get_srcdir()
 
 }
 /** start_service - do a zebra_start with a decent config name */
-ZebraService start_service(char *cfgname)
+ZebraService start_service(const char *cfgname)
 {
     char cfg[256];
     const char *srcdir = get_srcdir();
@@ -103,7 +103,7 @@ ZebraService start_service(char *cfgname)
         cfgname="zebra.cfg";
 
     sprintf(cfg, "%.200s/%.50s", srcdir, cfgname);
-    zs=zebra_start(cfg);
+    zs = zebra_start(cfg);
     if (!zs)
     {
         printf("zebra_start failed, probably because missing config file \n"
@@ -141,11 +141,13 @@ 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_data returned %d", i);
     if (i) 
     {
-        printf("init failed with %d\n",i);
+	yaz_log(log_level, "init_data: zebra_init failed with %d", i);
+        printf("init_data failed with %d\n", i);
         zebra_result(zh, &i, &addinfo);
+        yaz_log(log_level, "Error %d  %s", i, addinfo);
         printf("  Error %d   %s\n", i, addinfo);
         exit(1);
     }
@@ -178,6 +180,7 @@ int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
     rpn = yaz_pqf_parse(parser, odr, query);
     yaz_pqf_destroy(parser);
     if (!rpn) {
+	yaz_log(log_level, "PQF Parse failed\n");
         printf("Error: Parse failed \n%s\n", query);
         exit(1);
     }
@@ -187,6 +190,8 @@ int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
 	int code;
 	if (rc != ZEBRA_FAIL)
 	{
+	    yaz_log(log_level, "search returned %d (OK), but error was "
+		    "expected", rc);
 	    printf("Error: search returned %d (OK), but error was expected\n"
 		   "%s\n",  rc, query);
 	    exit(1);
@@ -194,6 +199,8 @@ int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
 	code = zebra_errCode(zh);
 	if (code != experror)
 	{
+	    yaz_log(log_level, "search returned error code %d, but error %d "
+		    "was expected", code, experror);
 	    printf("Error: search returned error code %d, but error %d was "
 		   "expected\n%s\n",
 		   code, experror, query);
@@ -204,11 +211,16 @@ int do_query_x(int lineno, ZebraHandle zh, const char *query, zint exphits,
     {
 	if (rc == ZEBRA_FAIL) {
 	    int code = zebra_errCode(zh);
+	    yaz_log(log_level, "search returned %d. Code %d", rc, code);
+	    
 	    printf("Error: search returned %d. Code %d\n%s\n", rc, 
 		   code, query);
 	    exit (1);
 	}
-	if (exphits != -1 && hits != exphits) {
+	if (exphits != -1 && hits != exphits)
+	{
+	    yaz_log(log_level, "search returned " ZINT_FORMAT 
+		   " hits instead of " ZINT_FORMAT, hits, exphits);
 	    printf("Error: search returned " ZINT_FORMAT 
 		   " hits instead of " ZINT_FORMAT "\n%s\n",
 		   hits, exphits, query);
@@ -238,7 +250,8 @@ void do_scan(int lineno, ZebraHandle zh, const char *query,
     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);
+    res = zebra_scan_PQF(zh, odr, query, &pos, &num, &entries, &partial, 
+			 0 /* setname */);
     if (res != ZEBRA_OK)
     {
 	printf("Error: scan returned %d (FAIL), but no error was expected\n"
@@ -377,6 +390,51 @@ void meta_query(int lineno, ZebraHandle zh, char *query, int exphits,
     free(positions);
 }
 
+void do_sort(ZebraHandle zh, const char *query, zint hits, zint *exp)
+{
+    ZebraMetaRecord *recs;
+    zint i;
+    int errs = 0;
+    zint min_val_recs = 0;
+    zint min_val_exp = 0;
+
+    assert(query);
+    do_query(__LINE__, zh, query, hits);
+
+    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
+    if (!recs)
+    {
+	fprintf(stderr, "recs==0\n");
+	exit(1);
+    }
+    /* find min for each sequence to get proper base offset */
+    for (i = 0; i<hits; i++)
+    {
+	if (min_val_recs == 0 || recs[i].sysno < min_val_recs)
+	    min_val_recs = recs[i].sysno;
+	if (min_val_exp == 0 || exp[i] < min_val_exp)
+	    min_val_exp = exp[i];
+    }
+	    
+    /* compare sequences using base offset */
+    for (i = 0; i<hits; i++)
+	if ((recs[i].sysno-min_val_recs) != (exp[i]-min_val_exp))
+	    errs++;
+    if (errs)
+    {
+	printf("Sequence not in right order for query\n%s\ngot exp\n",
+	       query);
+	for (i = 0; i<hits; i++)
+	    printf(" " ZINT_FORMAT "   " ZINT_FORMAT "\n",
+		   recs[i].sysno, exp[i]);
+    }
+    zebra_meta_records_destroy (zh, recs, 4);
+
+    if (errs)
+	exit(1);
+}
+
+
 struct finfo {
     const char *name;
     int occurred;