Fix tl_close_call (bug introduced in previous commit)

[idzebra-moved-to-github.git] / test / api / safari1.c

diff --git a/test/api/safari1.c b/test/api/safari1.c
index 8ecaca9..c014f85 100644 (file)
--- a/test/api/safari1.c
+++ b/test/api/safari1.c
@@ -1,4 +1,4 @@
-/* $Id: safari1.c,v 1.8 2005-11-10 08:08:19 adam Exp $
+/* $Id: safari1.c,v 1.12 2006-07-04 14:10:32 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -30,59 +30,74 @@ const char *myrec[] =
     /* chunk owner seq idx term */
     "00024338 125060 1 any the\n"
     "00024338 125060 2 any art\n"
-    "00024338 125060 3 any mand\n",
-
+    "00024338 125060 3 any mand\n"
+    ,
     "5678\n"  /* other record - same owner id */
     "00024339 125060 1 any den\n"
     "00024339 125060 2 any gamle\n"
-    "00024339 125060 3 any mand\n",
-
+    "00024339 125060 3 any mand\n"
+    ,
     "5678\n"  /* same record chunk id as before .. */
     "00024339 125060 1 any the\n"
     "00024339 125060 2 any gamle\n"
-    "00024339 125060 3 any mand\n",
-
+    "00024339 125060 3 any mand\n"
+    ,
     "1000\n"  /* separate record */
     "00024339 125061 1 any the\n"
     "00024339 125061 2 any gamle\n"
-    "00024339 125061 3 any mand\n",
-    
+    "00024339 125061 3 any mand\n"
+    ,
     "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",
+    "00024340 125062 3 any mand\n"
+    ,
+    "1002\n"  /* segment testing record */
+    "00024341 125062 1 title a\n"
+    "00024341 125062 2 title b\n"
+
+    "00024341 125062 1024 title b\n"
+    "00024341 125062 1025 title c\n"
+    "00024341 125062 1026 title d\n"
+    "00024341 125062 1027 title e\n"
+    "00024341 125062 1028 title f\n"
+
+    "00024341 125062 2048 title g\n"
+    "00024341 125062 2049 title c\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;
@@ -91,7 +106,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;
@@ -100,11 +115,38 @@ 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);
+    /* test segments */
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title a", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title b", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title c", 1));
+
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and a b", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and a c", 1));
+    
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and c d", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and b f", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and f g", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and g f", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and d g", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and g c", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and c g", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=title @and c c", 1));
+
+    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
+ */
+