X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftest_safari.c;h=2834b2fc33889ac36ea1762a42a40f4a4d236efd;hb=3bb2fd863b1664f1ff71dadb540313f301ca234f;hp=07513681aacecc6707b25134bf6e7dd2e9a5b8ed;hpb=2cf8341fde67a92369c46d9b12e6d056e5bc5a0e;p=idzebra-moved-to-github.git

diff --git a/test/api/test_safari.c b/test/api/test_safari.c
index 0751368..2834b2f 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-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
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief test safari filter
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "testlib.h"
 
 const char *myrec[] = 
@@ -92,6 +95,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 */
@@ -131,9 +140,9 @@ static void tst(int argc, char **argv)
                                   yaz_oid_recsyn_xml,
                                   "<record xmlns=\"http://www.indexdata.com/zebra/\">\n"
                                   "  <facet type=\"s\" index=\"ti\">\n"
-                                  "    <term coccur=\"1\">a b c</term>\n"
-                                  "    <term coccur=\"1\">j k l</term>\n"
-                                  "    <term coccur=\"1\">m n o</term>\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);
 
@@ -190,6 +199,7 @@ TL_MAIN
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab