X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Fsafari1.c;h=ae561ba4bdac23bbfe08c554e0ff28e02fd27768;hb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;hp=c1b0a813619e8b460d13a4886fdf03d2f95cb459;hpb=1fde4f52fc72af8e10a600a81c6f0924105add6a;p=idzebra-moved-to-github.git

diff --git a/test/api/safari1.c b/test/api/safari1.c
index c1b0a81..ae561ba 100644
--- a/test/api/safari1.c
+++ b/test/api/safari1.c
@@ -1,4 +1,4 @@
-/* $Id: safari1.c,v 1.7 2005-09-16 09:58:39 adam Exp $
+/* $Id: safari1.c,v 1.11 2006-05-10 08:13:35 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -26,7 +26,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 const char *myrec[] = 
 {
-    "1234\n"  /* first record */
+    "1234\n"  /* ID first record */
+    /* chunk owner seq idx term */
     "00024338 125060 1 any the\n"
     "00024338 125060 2 any art\n"
     "00024338 125060 3 any mand\n",
@@ -48,39 +49,41 @@ const char *myrec[] =
     
     "1001\n"  /* separate record */
     "00024340 125062 1 any the\n"
+    "00024340 125062 1 any the\n" /* DUP KEY, bug #432 */
     "00024340 125062 2 any old\n"
     "00024340 125062 3 any mand\n",
-    
+
     0
 };
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     zint ids[3];
     zint limits[3];
-    ZebraService zs = start_up("safari.cfg", argc, argv);
+    ZebraService zs = tl_start_up("safari.cfg", argc, argv);
     
     ZebraHandle zh = zebra_open(zs, 0);
 
-    init_data(zh, myrec);
-    do_query(__LINE__, zh, "@attr 1=any the", 3);
-    do_query(__LINE__, zh, "@attr 1=any {the art}", 1);
-    do_query(__LINE__, zh, "@attr 1=any {den gamle}", 0);
-    do_query(__LINE__, zh, "@attr 1=any {the gamle}", 1);
-    do_query(__LINE__, zh, "@attr 1=any {the of}", 0);
+    YAZ_CHECK(tl_init_data(zh, myrec));
+
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any the", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @and the art", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @and den gamle", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @and the gamle", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @and the of", 0));
 
     /* verify that we get these records exactly */
     ids[0] = 24338;
     ids[1] = 24339;
     ids[2] = 24340;
-    meta_query(__LINE__, zh, "@attr 1=any mand", 3, ids);
+    YAZ_CHECK(tl_meta_query(zh, "@attr 4=3 @attr 1=any mand", 3, ids));
 
     /* limit to 125061 */
     limits[0] = 125061;
     limits[1] = 0;
     zebra_set_limit(zh, 0, limits);
     ids[0] = 24339;
-    meta_query(__LINE__, zh, "@attr 1=any mand", 1, ids);
+    YAZ_CHECK(tl_meta_query(zh, "@attr 4=3 @attr 1=any mand", 1, ids));
 
     /* limit to 125060, 125061 */
     limits[0] = 125061;
@@ -89,7 +92,7 @@ int main(int argc, char **argv)
     zebra_set_limit(zh, 0, limits);
     ids[0] = 24338;
     ids[1] = 24339;
-    meta_query(__LINE__, zh, "@attr 1=any mand", 2, ids);
+    YAZ_CHECK(tl_meta_query(zh, "@attr 4=3 @attr 1=any mand", 2, ids));
 
     /* all except 125062 */
     limits[0] = 125062;
@@ -98,11 +101,21 @@ int main(int argc, char **argv)
 
     ids[0] = 24338;
     ids[1] = 24339;
-    meta_query(__LINE__, zh, "@attr 1=any mand", 2, ids);
+    YAZ_CHECK(tl_meta_query(zh, "@attr 4=3 @attr 1=any mand", 2, ids));
 
     /* no limit */
     zebra_set_limit(zh, 1, 0);
-    do_query(__LINE__, zh, "@attr 1=any mand", 3);
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any mand", 3));
 
-    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
+ */
+