X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxpath%2Fxpath2.c;h=e2f1a6aa10bd4284c3a6316039cee4927cc30efa;hb=6d2a90b3e3802726c044e128d1a34f5f892f9f3f;hp=394c117b08c8a373dcea01e7b8fe99d2f9c439a2;hpb=a34c87ac6c08ec62534e4068a5bd1fac93df8abe;p=idzebra-moved-to-github.git

diff --git a/test/xpath/xpath2.c b/test/xpath/xpath2.c
index 394c117..e2f1a6a 100644
--- a/test/xpath/xpath2.c
+++ b/test/xpath/xpath2.c
@@ -1,6 +1,6 @@
-/* $Id: xpath2.c,v 1.1 2004-12-02 14:05:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: xpath2.c,v 1.8 2007-01-15 15:10:25 adam Exp $
+   Copyright (C) 1995-2007
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,9 @@ 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
+
 */
 
 #include "../api/testlib.h"
@@ -69,14 +69,25 @@ 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);
+    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
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+