X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fxpath%2Fxpath2.c;h=23ac2e7fe0240cca61362df2cce5b75d113ce5d8;hp=bf60694185809dd6acea9c5ecbf60be35c203b00;hb=e4c6861efeeea654bfb00c5f0239ee258629d77f;hpb=cf7ec53452a6180dad6592df0458ac56a3b7963b

diff --git a/test/xpath/xpath2.c b/test/xpath/xpath2.c
index bf60694..23ac2e7 100644
--- a/test/xpath/xpath2.c
+++ b/test/xpath/xpath2.c
@@ -1,8 +1,5 @@
-/* $Id: xpath2.c,v 1.2 2004-12-15 13:07:07 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "../api/testlib.h"
 
 /** xpath2.c - index a a bit more complex sgml record and search in it */
@@ -69,14 +69,26 @@ const char *myrec[] = {
     0};
 
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle zh = zebra_open (zs);
-    init_data(zh, myrec);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
+    YAZ_CHECK(tl_init_data(zh, myrec));
 
-    do_query(__LINE__,zh, "@attr 1=/Zthes/termName Sauropoda", 1);
-    do_query(__LINE__,zh, "@attr 1=/Zthes/relation/termName Sauropoda",1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=/Zthes/termName Sauropoda", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=/Zthes/relation/termName Sauropoda", 1));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+