X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fxpath%2Fxpath5.c;h=8c49f7688fab6fa6747a446fbf5a5f4348414c0f;hp=34f12c0d5445b10dc7a6f4bb79a0ba6db26c9d26;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=a34c87ac6c08ec62534e4068a5bd1fac93df8abe

diff --git a/test/xpath/xpath5.c b/test/xpath/xpath5.c
index 34f12c0..8c49f76 100644
--- a/test/xpath/xpath5.c
+++ b/test/xpath/xpath5.c
@@ -1,6 +1,6 @@
-/* $Id: xpath5.c,v 1.1 2004-12-02 14:05:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: xpath5.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.
 
@@ -22,7 +22,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "../api/testlib.h"
 
-/** xpath4.c - Ranking in xpath */
+/** xpath5.c - Ranking in xpath */
 
 const char *recs[] = {
         "<record>\n"
@@ -55,27 +55,33 @@ const char *recs[] = {
         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, recs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
 
-//     yaz_log_init_level(LOG_ALL);
+    YAZ_CHECK(tl_init_data(zh, recs));
 
-#define q(qry,hits,string,score) \
-    ranking_query(__LINE__,zh,qry,hits,string,score)
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=/record/title @attr 2=102 the",
+            3,"first title", 952));
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=/ @attr 2=102 @or third foo",
+            3,"third title", 802));
 
-    q("@attr 1=/record/title @attr 2=102 the",
-            3,"first title",952);
-    q("@attr 1=/ @attr 2=102 @or third foo",
-            3,"third title",802);
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=/ @attr 2=102 foo",
+            3,"second title", 850));
 
-    q("@attr 1=/ @attr 2=102 foo",
-            3,"second title",850);
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=/record/ @attr 2=102 foo",
+            3,"second title", 927));
 
-    q("@attr 1=/record/ @attr 2=102 foo",
-            3,"second title",927);
-
-    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
+ */
+