X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=79cdc415adfdfad9fdf7a3024b4f34e5302968e9;hb=8e4994aae59602f0caabe147d8ebd65ec08d3e3a;hp=d80ab135b06da1b5ecb63959853c66d48e5c5043;hpb=e77e69cb9cf741189af0cd5ffb165c3d67cd7fa7;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index d80ab13..79cdc41 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,4 +1,4 @@
-/* $Id: testlib.c,v 1.22 2005-06-14 20:02:30 adam Exp $
+/* $Id: testlib.c,v 1.26 2005-08-18 12:50:18 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -22,8 +22,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /** testlib - utilities for the api tests */
 
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
+#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -65,10 +69,14 @@ void start_log(int argc, char **argv)
  */
 ZebraService start_up(char *cfgname, int argc, char **argv)
 {
+#if HAVE_SYS_RESOURCE_H
+#if HAVE_SYS_TIME_H
     struct rlimit rlim;
     rlim.rlim_cur = 20;
     rlim.rlim_max = 20;
     setrlimit(RLIMIT_CPU, &rlim);
+#endif
+#endif
     nmem_init();
     start_log(argc, argv);
     return start_service(cfgname);
@@ -133,10 +141,10 @@ 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);
+        printf("init_data failed with %d\n",i);
         zebra_result(zh, &i, &addinfo);
         printf("  Error %d   %s\n", i, addinfo);
         exit(1);
@@ -230,7 +238,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"
@@ -369,6 +378,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;