X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fxpath%2Fxpath6.c;h=f22e714020a4a3ab4baf344e1db19c8596bce4ab;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hp=9828f8dc22f3bee89b26b2afc458c8ef20d1de1a;hpb=69983aaec470e41649c4dfae8a9e7cbcf061cacf;p=idzebra-moved-to-github.git

diff --git a/test/xpath/xpath6.c b/test/xpath/xpath6.c
index 9828f8d..f22e714 100644
--- a/test/xpath/xpath6.c
+++ b/test/xpath/xpath6.c
@@ -1,8 +1,5 @@
-/* $Id: xpath6.c,v 1.4 2005-06-29 16:52:27 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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,54 +12,82 @@ 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"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     int i;
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle zh = zebra_open(zs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
     char path[256];
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
-    check_filter(zs, "grs.xml");
+    tl_check_filter(zs, "grs.xml");
 
     zebra_set_resource(zh, "recordType", "grs.xml");
 
-    zebra_begin_trans(zh, 1);
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
     for (i = 1; i <= 2; i++)
     {
-        sprintf(path, "%.200s/rec%d.xml", get_srcdir(), i);
+        sprintf(path, "%.200s/rec%d.xml", tl_get_srcdir(), i);
         zebra_repository_update(zh, path);
     }
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
-    
 
-    do_query(__LINE__, zh, "@attr 5=1 @attr 6=3  @attr 4=1 @attr 1=/assembled/basic/names/CASno \"367-93-1\"", 2);
+    YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 6=3  @attr 4=1 @attr 1=/assembled/basic/names/CASno \"367-93-1\"", 2));
 
-    do_query(__LINE__, zh, "@attr 5=1 @attr 6=3  @attr 4=1 @attr 1=18 \"367-93-1\"", 2);
+    YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 6=3  @attr 4=1 @attr 1=18 \"367-93-1\"", 2));
 
-    do_query(__LINE__, zh, "@attr 1=/assembled/orgs/org 0", 1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=/assembled/orgs/org 0", 1));
     
-    do_query(__LINE__, zh, 
+    YAZ_CHECK(tl_query(zh, 
 	     "@and @attr 1=/assembled/orgs/org 0 @attr 5=1 @attr 6=3 @attr 4=1 "
-	     "@attr 1=/assembled/basic/names/CASno \"367-93-1\"", 1);
+	     "@attr 1=/assembled/basic/names/CASno \"367-93-1\"", 1));
 
-    do_query(__LINE__, zh,
+    YAZ_CHECK(tl_query(zh,
 	     "@and @attr 1=/assembled/orgs/org 1 @attr 5=1 @attr 6=3  @attr 4=1 "
-	     "@attr 1=/assembled/basic/names/CASno 367-93-1", 2);
+	     "@attr 1=/assembled/basic/names/CASno 367-93-1", 2));
 
     /* bug #317 */
-    do_query(__LINE__, zh, "@attr 1=1010 46", 2);
+    YAZ_CHECK(tl_query(zh, "@attr 1=1010 46", 2));
+
+    /* bug #431 */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1021 0", 1));
+
+    /* bug #431 */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1021 46", 1));
 
-    return close_down(zh, zs, 0);
+    /* bug #431 */
+    YAZ_CHECK(tl_query(zh, "@attr 1=1021 1", 0));
+
+    /* bug #460 */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 46", 0));
+
+    /* bug #460 */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 beta", 1));
+
+    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
+ */
+