X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxpath%2Fxpath1.c;h=2c8621395823e1a2aa487623aa38fd1e3a0761c9;hb=8407158947485c3897c8232bf5a1f4501eb5e710;hp=434d715380795724a4330f73aad9a8f9f6410769;hpb=a34c87ac6c08ec62534e4068a5bd1fac93df8abe;p=idzebra-moved-to-github.git

diff --git a/test/xpath/xpath1.c b/test/xpath/xpath1.c
index 434d715..2c86213 100644
--- a/test/xpath/xpath1.c
+++ b/test/xpath/xpath1.c
@@ -1,6 +1,6 @@
-/* $Id: xpath1.c,v 1.1 2004-12-02 14:05:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: xpath1.c,v 1.5 2006-03-31 15:58:10 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,7 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 /** xpath1.c - index a simple sgml record and search in it */
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     ZebraService zs;
     ZebraHandle zh;
@@ -38,20 +38,22 @@ int main(int argc, char **argv)
         "</sgml> \n",
         0};
 
-    zs = start_up("zebraxpath.cfg", argc, argv);
-    zh = zebra_open(zs);
-    init_data(zh, myrec);
+    zs = tl_start_up(0, argc, argv);
+    zh = zebra_open(zs, 0);
+    YAZ_CHECK(tl_init_data(zh, myrec));
 
-    do_query(__LINE__,zh, "@attr 1=/sgml/tag before", 0);
-    do_query(__LINE__,zh, "@attr 1=/sgml/tag inside", 1);
-    do_query(__LINE__,zh, "@attr 1=/sgml/tag after", 0);
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml/tag before", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml/tag inside", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml/tag after", 0));
 
-    do_query(__LINE__,zh, "@attr 1=/sgml/none after", 0);
-    do_query(__LINE__,zh, "@attr 1=/sgml/none inside", 0);
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml/none after", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml/none inside", 0));
 
-    do_query(__LINE__,zh, "@attr 1=/sgml before", 1);
-    do_query(__LINE__,zh, "@attr 1=/sgml inside", 1);
-    do_query(__LINE__,zh, "@attr 1=/sgml after", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml before", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml inside", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/sgml after", 1));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN