X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxpath%2Fxpath1.c;h=b9356a359f5a4e4f28c03c764b07fc29b92932c2;hb=296574b8e825da3594047d8d63c9639d90866047;hp=ea428ede49e58cbee44fc5d22ce412ea86ee7d9d;hpb=cf7ec53452a6180dad6592df0458ac56a3b7963b;p=idzebra-moved-to-github.git

diff --git a/test/xpath/xpath1.c b/test/xpath/xpath1.c
index ea428ed..b9356a3 100644
--- a/test/xpath/xpath1.c
+++ b/test/xpath/xpath1.c
@@ -1,6 +1,6 @@
-/* $Id: xpath1.c,v 1.2 2004-12-15 13:07:07 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: xpath1.c,v 1.6 2006-05-10 08:13:41 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,30 @@ int main(int argc, char **argv)
         "</sgml> \n",
         0};
 
-    zs = start_up(0, 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
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+