X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fxpath%2Fxpath3.c;h=72cde5429e9193f26e7d199eb29b7e7cbe33ff0d;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hp=8f191b0046953ebdacfc84df8747704143b3248b;hpb=a34c87ac6c08ec62534e4068a5bd1fac93df8abe;p=idzebra-moved-to-github.git

diff --git a/test/xpath/xpath3.c b/test/xpath/xpath3.c
index 8f191b0..72cde54 100644
--- a/test/xpath/xpath3.c
+++ b/test/xpath/xpath3.c
@@ -1,7 +1,7 @@
 
-/* $Id: xpath3.c,v 1.1 2004-12-02 14:05:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: xpath3.c,v 1.7 2006-05-10 08:13:41 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -36,20 +36,28 @@ const char *myrec[] = {
     0};
 
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up("zebraxpath.cfg", argc, argv);
-    ZebraHandle zh = zebra_open(zs);
-    init_data(zh, myrec);
-
-#define q(qry,hits) do_query(__LINE__,zh,qry,hits)
-
-    q("@attr 1=/root content",1);
-    q("@attr 1=/root/first content",1);
-    q("@attr {1=/root/first[@attr='danish']} content",1);
-    q("@attr {1=/root/second[@attr='danish lake']} content",1);
-    /*q("@attr {1=/root/third[@attr='dansk sø']} content",1); */
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
+    YAZ_CHECK(tl_init_data(zh, myrec));
+
+    YAZ_CHECK(tl_query(zh, "@attr 1=/root content",1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/root/first content",1));
+    YAZ_CHECK(tl_query(zh, "@attr {1=/root/first[@attr='danish']} content",1));
+    YAZ_CHECK(tl_query(zh, "@attr {1=/root/second[@attr='danish lake']} content",1));
+    YAZ_CHECK(tl_query(zh, "@attr {1=/root/third[@attr='dansk s\xc3\xb8']} content",1)); 
     /* FIXME - This triggers bug200 */
 
-    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
+ */
+