X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftest_safari.c;h=3a053ec75c6f07413ed968e7f1b41a5e296ef120;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hp=e28ac6d9bd6ab517ee596fa06e1fc472d2809b5e;hpb=4717561b3bc0bcd508b5d017079bd99b3a27dd84;p=idzebra-moved-to-github.git

diff --git a/test/api/test_safari.c b/test/api/test_safari.c
index e28ac6d..3a053ec 100644
--- a/test/api/test_safari.c
+++ b/test/api/test_safari.c
@@ -1,5 +1,5 @@
 /* This file is part of the Zebra server.
-   Copyright (C) 1995-2008 Index Data
+   Copyright (C) 1994-2010 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
@@ -30,28 +30,33 @@ const char *myrec[] =
     "00024338 125060 0 1 any the\n"
     "00024338 125060 0 2 any art\n"
     "00024338 125060 0 3 any mand\n"
+    "s 00024338 125060 0 3 ti a b c\n"
     ,
     "5678\n"  /* other record - same owner id */
     "00024339 125060 0 1 any den\n"
     "00024339 125060 0 2 any gamle\n"
     "00024339 125060 0 3 any mand\n"
+    "s 00024339 125060 0 3 ti d e f\n"
     ,
     "5678\n"  /* same record chunk id as before .. */
     "00024339 125060 0 1 any the\n"
     "00024339 125060 0 2 any gamle\n"
     "00024339 125060 0 3 any mand\n"
+    "s 00024339 125060 0 3 ti g h i\n"
     ,
     "1000\n"  /* separate record */
     "00024339 125061 0 1 any the\n"
     "00024339 125061 0 2 any gamle\n"
     "00024339 125061 0 3 any mand\n"
-    "w 00024339 125661 0 4 any Hello\n"
+    "w 00024339 125661 0 4 any Hello\n" /* index type given */
+    "s 00024339 125061 0 3 ti j k l\n"
     ,
     "1001\n"  /* separate record */
     "00024340 125062 0 1 any the\n"
     "00024340 125062 0 1 any the\n" /* DUP KEY, bug #432 */
     "00024340 125062 0 2 any old\n"
     "00024340 125062 0 3 any mand\n"
+    "s 00024340 125062 0 3 ti m n o\n"
     ,
     "1002\n"  /* segment testing record */
     "00024341 125062 0 1 title a\n"
@@ -87,6 +92,12 @@ static void tst(int argc, char **argv)
     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));
 
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @prox 0 3 1 2 k 2 the gamle", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @prox 0 3 1 2 k 2 den gamle", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @prox 0 3 1 2 k 2 the art", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @prox 0 3 1 2 k 2 den gamle", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 4=3 @attr 1=any @prox 0 3 1 2 k 2 old mand", 1));
+
     YAZ_CHECK(tl_query(zh, "@attr 1=any hello", 1));
 
     /* verify that we get these records exactly */
@@ -103,7 +114,7 @@ static void tst(int argc, char **argv)
                                   myrec[4]), ZEBRA_OK);
     YAZ_CHECK_EQ(tl_fetch_compare(zh, 1, "zebra::facet::any:0", 
                                   yaz_oid_recsyn_xml,
-                                  "<facets>\n"
+                                  "<record xmlns=\"http://www.indexdata.com/zebra/\">\n"
                                   "  <facet type=\"0\" index=\"any\">\n"
                                   "    <term coccur=\"4\" occur=\"3\">mand</term>\n"
                                   "    <term coccur=\"4\" occur=\"3\">the</term>\n"
@@ -111,15 +122,26 @@ static void tst(int argc, char **argv)
                                   "    <term coccur=\"2\" occur=\"1\">gamle</term>\n"
                                   "    <term coccur=\"1\" occur=\"1\">old</term>\n"
                                   "  </facet>\n"
-                                  "</facets>\n"), ZEBRA_OK);
+                                  "</record>\n"), ZEBRA_OK);
     YAZ_CHECK_EQ(tl_fetch_compare(zh, 1, "zebra::facet::any:0:2", 
                                   yaz_oid_recsyn_xml,
-                                  "<facets>\n"
-                                  "  <facet type=\"0\" index=\"any\">\n"
+                                  "<record xmlns=\"http://www.indexdata.com/zebra/\">\n"
+                               "  <facet type=\"0\" index=\"any\">\n"
                                   "    <term coccur=\"4\" occur=\"3\">mand</term>\n"
                                   "    <term coccur=\"4\" occur=\"3\">the</term>\n"
                                   "  </facet>\n"
-                                  "</facets>\n"), ZEBRA_OK);
+                                  "</record>\n"), ZEBRA_OK);
+
+
+    YAZ_CHECK_EQ(tl_fetch_compare(zh, 1, "zebra::facet::ti:s", 
+                                  yaz_oid_recsyn_xml,
+                                  "<record xmlns=\"http://www.indexdata.com/zebra/\">\n"
+                                  "  <facet type=\"s\" index=\"ti\">\n"
+                                  "    <term coccur=\"1\" occur=\"1\">a b c</term>\n"
+                                  "    <term coccur=\"1\" occur=\"1\">j k l</term>\n"
+                                  "    <term coccur=\"1\" occur=\"1\">m n o</term>\n"
+                                  "  </facet>\n"
+                                  "</record>\n"), ZEBRA_OK);
 
     /* limit to 125061 */
     limits[0] = 125061;
@@ -174,6 +196,7 @@ TL_MAIN
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab