X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fsort2%2Ft1.c;h=66f81c5a1c6777c398954d52a94e86ee36b50240;hp=126123e2c5a2d2f147e8764baa48f2f2b0126185;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=3f98e1f5f48b3aaaa496ac92127dff0ff3fe48cc

diff --git a/test/sort2/t1.c b/test/sort2/t1.c
index 126123e..66f81c5 100644
--- a/test/sort2/t1.c
+++ b/test/sort2/t1.c
@@ -1,6 +1,6 @@
-/* $Id: t1.c,v 1.1 2004-12-04 01:08:33 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: t1.c,v 1.6 2006-05-10 08:13:39 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -22,51 +22,42 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "../api/testlib.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle  zh = zebra_open(zs);
-    ZebraMetaRecord *recs;
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
     char path[256];
-    int i, errs = 0;
+    int i;
+    zint ids[5];
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
-    zebra_begin_trans(zh, 1);
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
     for (i = 1; i <= 4; i++)
     {
-        sprintf(path, "%.200s/rec%d.xml", get_srcdir(), i);
+        sprintf(path, "%.200s/rec%d.xml", tl_get_srcdir(), i);
         zebra_repository_update(zh, path);
     }
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    do_query(__LINE__, zh, "@or computer @attr 7=1 @attr 1=4 0", 4);
+    ids[0] = 2;
+    ids[1] = 5;
+    ids[2] = 3;
+    ids[3] = 4;
+    YAZ_CHECK(tl_sort(zh, "@or computer @attr 7=1 @attr 1=4 0", 4, ids));
 
-    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
-    if (!recs)
-    {
-	fprintf(stderr, "recs==0\n");
-	exit(1);
-    }
-    if (recs[0].sysno != 2)
-	errs++;
-    if (recs[1].sysno != 5)
-	errs++;
-    if (recs[2].sysno != 3)
-	errs++;
-    if (recs[3].sysno != 4)
-	errs++;
+    YAZ_CHECK(tl_close_down(zh, zs));
+}
 
-    zebra_meta_records_destroy (zh, recs, 4);
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
 
-    if (errs)
-    {
-	fprintf(stderr, "%d sysnos did not match\n", errs);
-	exit(1);
-    }
-
-    return close_down(zh, zs, 0);
-}