X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ffilters%2Ftext.c;h=c16a8591caa6775d5c9115fadca519b47d3668c6;hb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;hp=4880eb3b3e8dd6aa10b791954eb681aafffd6fa6;hpb=cc74bd253ed898cd5b94826912cbc1ca1c940387;p=idzebra-moved-to-github.git

diff --git a/test/filters/text.c b/test/filters/text.c
index 4880eb3..c16a859 100644
--- a/test/filters/text.c
+++ b/test/filters/text.c
@@ -1,4 +1,4 @@
-/* $Id: text.c,v 1.2 2005-09-13 11:51:08 adam Exp $
+/* $Id: text.c,v 1.3 2006-03-31 15:58:07 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -22,41 +22,43 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "../api/testlib.h"
 
-int main(int argc, char **argv)
+void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
+    ZebraService zs = tl_start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs, 0);
     char path[256];
 
-    check_filter(zs, "text");
+    tl_check_filter(zs, "text");
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_set_resource(zh, "recordType", "text");
 
     zebra_init(zh);
 
-    zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/record.xml", get_srcdir());
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+    sprintf(path, "%.200s/record.xml", tl_get_srcdir());
     zebra_repository_update(zh, path);
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    do_query(__LINE__, zh, "text", 1);
+    YAZ_CHECK(tl_query(zh, "text", 1));
 
-    do_query(__LINE__, zh, "test", 0);
+    YAZ_CHECK(tl_query(zh, "test", 0));
 
     zebra_set_resource(zh, "recordType", "text.$");
 
-    zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/record.xml", get_srcdir());
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+    sprintf(path, "%.200s/record.xml", tl_get_srcdir());
     zebra_repository_update(zh, path);
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    do_query(__LINE__, zh, "text", 3);
+    YAZ_CHECK(tl_query(zh, "text", 3));
 
-    do_query(__LINE__, zh, "here", 2);
+    YAZ_CHECK(tl_query(zh, "here", 2));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN