X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxpath%2Fxpath5.c;h=1f402d09d99df4b12fa3bb7ff50e71d498ef2cde;hb=e26fd4d7361802023a6264f406e98d71503050cd;hp=4ca43ab50552bf57c0d75b3c301c4b767b478a2a;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git

diff --git a/test/xpath/xpath5.c b/test/xpath/xpath5.c
index 4ca43ab..1f402d0 100644
--- a/test/xpath/xpath5.c
+++ b/test/xpath/xpath5.c
@@ -1,5 +1,5 @@
-/* $Id: xpath5.c,v 1.3 2005-01-15 19:38:40 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: xpath5.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"
@@ -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(0, argc, argv);
-    ZebraHandle zh = zebra_open(zs);
-    init_data(zh, recs);
-
-//     yaz_log_init_level(LOG_ALL);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
 
-#define q(qry,hits,string,score) \
-    ranking_query(__LINE__,zh,qry,hits,string,score)
+    YAZ_CHECK(tl_init_data(zh, recs));
 
-    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=/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=/ @attr 2=102 foo",
-            3,"second title",850);
+    YAZ_CHECK(tl_ranking_query(zh, "@attr 1=/ @attr 2=102 foo",
+            3,"second title", 850));
 
-    q("@attr 1=/record/ @attr 2=102 foo",
-            3,"second title",927);
+    YAZ_CHECK(tl_ranking_query(zh, "@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
+ */
+