X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft7.c;h=d5ce6eace8002d45ba365135771758b7138d8142;hb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;hp=cdae308b8ad4e12031809d44e8c9f3fa90edda17;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580;p=idzebra-moved-to-github.git

diff --git a/test/api/t7.c b/test/api/t7.c
index cdae308..d5ce6ea 100644
--- a/test/api/t7.c
+++ b/test/api/t7.c
@@ -1,4 +1,4 @@
-/* $Id: t7.c,v 1.10 2005-09-13 11:51:07 adam Exp $
+/* $Id: t7.c,v 1.12 2006-05-10 08:13:35 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -31,15 +31,13 @@ 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);
+    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);    
@@ -48,46 +46,26 @@ int main(int argc, char **argv)
     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);
-    }
+    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 */
 
-    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_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
+ */
+