X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft7.c;h=22314bccf0fa092ac78db73d81434de84200c23a;hb=76ef1248858c492953d506a970ac12e74a29f712;hp=0c4d308d899d48b8b842ba58ec479bb2cfccce75;hpb=6cb032fd2ece4742e3516e0941507143f677e5cd;p=idzebra-moved-to-github.git

diff --git a/test/api/t7.c b/test/api/t7.c
index 0c4d308..22314bc 100644
--- a/test/api/t7.c
+++ b/test/api/t7.c
@@ -1,5 +1,5 @@
-/* $Id: t7.c,v 1.9 2005-05-11 12:39:38 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: t7.c,v 1.13 2006-05-30 22:03:13 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -31,63 +31,41 @@ const char *recs[] = {
         "</gils>\n",
         0};
 
-
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     const char *setname1 = "set1";
     const char *setname2 = "set2";
     const char *setname3 = "set3";
     int status;
-    ZEBRA_RES ret;
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle  zh = zebra_open (zs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open (zs, 0);
     ODR odr_input = odr_createmem (ODR_DECODE);    
     ODR odr_output = odr_createmem (ODR_ENCODE);    
     YAZ_PQF_Parser parser = yaz_pqf_create();
     Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, "@attr 1=4 my");
-    Z_SortKeySpecList *spec = yaz_sort_spec (odr_output, "1=4 <");
+    Z_SortKeySpecList *spec = yaz_sort_spec (odr_output, "1=4 <!");
     zint hits;
 
-    init_data(zh, recs);
+    YAZ_CHECK(tl_init_data(zh, recs));
 
-    zebra_begin_trans(zh, 0);
+    YAZ_CHECK(zebra_begin_trans(zh, 0) == ZEBRA_OK);
         
-    ret = zebra_search_RPN(zh, odr_input, query, setname1, &hits);
-    if (ret == ZEBRA_FAIL)
-    {
-	int code = zebra_errCode(zh);
-        printf("search returned ERROR, OK was expected ret=%d  "
-	       "code=%d\n", ret, code); 
-    }
-
-    ret = zebra_sort(zh, odr_output, 1, &setname1, setname2, spec, &status);
-    if (ret == ZEBRA_FAIL) 
-    { 
-	int code = zebra_errCode(zh);
-        printf("sort A returned ERROR, OK was expected ret=%d status=%d "
-	       "code=%d\n", ret, status, code); 
-        exit(1);
-    }
-    
-    ret = zebra_sort(zh, odr_output, 1, &setname2, setname3, spec, &status);
-    if (ret == ZEBRA_FAIL)
-    { 
-	int code = zebra_errCode(zh);
-        printf("sort B returned ERROR, OK was expected ret=%d status=%d "
-	       "code=%d\n", ret, status, code); 
-        exit(1);
-    }
-
-    spec = yaz_sort_spec(odr_output, "1=5 <"); /* invalid sort spec */
-
-    ret = zebra_sort(zh, odr_output, 1, &setname1, setname2, spec, &status);
-    if (ret == ZEBRA_OK) 
-    { 
-        printf("sort C returned OK, ERROR was expected ret=%d status=%d\n",
-	       ret, status);
-        exit(1);
-    }
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_search_RPN(zh, odr_input, query, setname1, &hits) ==
+	      ZEBRA_OK);
+
+    YAZ_CHECK(zebra_sort(zh, odr_output, 1, &setname1, setname2, spec,
+			 &status)
+	      == ZEBRA_OK);
+    YAZ_CHECK(zebra_sort(zh, odr_output, 1, &setname2, setname3, spec, 
+			 &status) == ZEBRA_OK);
+
+    spec = yaz_sort_spec(odr_output, "1=5 <!"); /* invalid sort spec */
+
+    YAZ_CHECK(zebra_sort(zh, odr_output, 1, &setname1, setname2, spec,
+			 &status) == ZEBRA_FAIL);
+
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
+
     yaz_pqf_destroy(parser);
 
     /*
@@ -99,5 +77,15 @@ int main(int argc, char **argv)
 
     zebra_commit(zh);
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+