X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxslt%2Fxslt3.c;fp=test%2Fxslt%2Fxslt3.c;h=10699a3566b3d79c09e8c74a20cc1854e545da90;hb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;hp=8b85959722582a6268335df64d7f0969775daffc;hpb=cc74bd253ed898cd5b94826912cbc1ca1c940387;p=idzebra-moved-to-github.git

diff --git a/test/xslt/xslt3.c b/test/xslt/xslt3.c
index 8b85959..10699a3 100644
--- a/test/xslt/xslt3.c
+++ b/test/xslt/xslt3.c
@@ -1,4 +1,4 @@
-/* $Id: xslt3.c,v 1.5 2006-02-23 11:26:00 adam Exp $
+/* $Id: xslt3.c,v 1.6 2006-03-31 15:58:10 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -23,7 +23,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include "testlib.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     char path[256];
     char record_buf[20000];
@@ -33,18 +33,18 @@ int main(int argc, char **argv)
     FILE *f;
     size_t r;
 
-    ZebraService zs = start_up(0, argc, argv);
+    ZebraService zs = tl_start_up(0, argc, argv);
     ZebraHandle  zh = zebra_open(zs, 0);
 
-    check_filter(zs, "xslt");
+    tl_check_filter(zs, "xslt");
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
     
     zebra_init(zh);
 
     zebra_set_resource(zh, "recordType", "xslt.marcschema-one.xml");
 
-    sprintf(path, "%.200s/marc-one.xml", get_srcdir());
+    sprintf(path, "%.200s/marc-one.xml", tl_get_srcdir());
     f = fopen(path, "rb");
     if (!f)
     {
@@ -62,12 +62,12 @@ int main(int argc, char **argv)
     record_buf[r] = '\0';
 
     /* index this one record */
-    init_data(zh, records_array);
+    YAZ_CHECK(tl_init_data(zh, records_array));
 
     /* only get hits from first record .. */
-    do_query(__LINE__, zh, "@attr 1=title computer", 1);
-    do_query(__LINE__, zh, "@attr 1=control 11224466", 1);
-    do_query_x(__LINE__, zh, "@attr 1=titl computer", 0, 114);
+    YAZ_CHECK(tl_query(zh, "@attr 1=title computer", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=control 11224466", 1));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=titl computer", 0, 114));
 
     
     /* index one more time to see that we don't get dups, since
@@ -75,11 +75,12 @@ int main(int argc, char **argv)
     zebra_add_record(zh, record_buf, strlen(record_buf));
 
     /* only get hits from first record .. */
-    do_query(__LINE__, zh, "@attr 1=title computer", 1);
-    do_query(__LINE__, zh, "@attr 1=control 11224466", 1);
-    do_query_x(__LINE__, zh, "@attr 1=titl computer", 0, 114);
+    YAZ_CHECK(tl_query(zh, "@attr 1=title computer", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=control 11224466", 1));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=titl computer", 0, 114));
     
-
-    
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+