X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft5.c;h=b1ca90d34dd7ef126baadec724a16684efcb530c;hb=325dfaa45a42dd93f7a3741682310630f0f6bd3c;hp=a8fc54be60c3480ce391e706f6b7a933e8cf9d84;hpb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;p=idzebra-moved-to-github.git

diff --git a/test/api/t5.c b/test/api/t5.c
index a8fc54b..b1ca90d 100644
--- a/test/api/t5.c
+++ b/test/api/t5.c
@@ -1,4 +1,4 @@
-/* $Id: t5.c,v 1.15 2006-03-31 15:58:05 adam Exp $
+/* $Id: t5.c,v 1.18 2006-06-28 09:39:34 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -37,6 +37,32 @@ static void tst(int argc, char **argv)
 
     YAZ_CHECK(tl_init_data(zh, myrec));
 
+    /* and searches */
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 notfound @attr 1=4 x", 0)); 
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 x @attr 1=4 notfound", 0)); 
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 notfound @attr 1=4 notfound", 0)); 
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 x @attr 1=4 x", 2)); 
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 x @attr 1=4 my", 2)); 
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 my @attr 1=4 x", 2)); 
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=4 my @attr 1=4 my", 3)); 
+
+    /* or searches */
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 notfound @attr 1=4 x", 2)); 
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 x @attr 1=4 notfound", 2)); 
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 notfound @attr 1=4 notfound", 0)); 
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 x @attr 1=4 x", 2)); 
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 x @attr 1=4 my", 3)); 
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 my @attr 1=4 x", 3)); 
+    YAZ_CHECK(tl_query(zh, "@or @attr 1=4 my @attr 1=4 my", 3)); 
+
+    /* not searches */
+    /* bug 619 */
+    YAZ_CHECK(tl_query(zh, "@not @attr 1=4 notfound @attr 1=4 x", 0)); 
+    YAZ_CHECK(tl_query(zh, "@not @attr 1=4 x @attr 1=4 x", 0));
+    YAZ_CHECK(tl_query(zh, "@not @attr 1=4 my @attr 1=4 x", 1));
+    YAZ_CHECK(tl_query(zh, "@not @attr 1=4 my @attr 1=4 notfound", 3));
+    YAZ_CHECK(tl_query(zh, "@not @attr 1=4 notfound @attr 1=4 notfound", 0));
+    
     /* phrase searches */
     YAZ_CHECK(tl_query(zh, "@attr 1=4 my", 3));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 {my x}", 1));
@@ -59,22 +85,20 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=105 {e x}", 2));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 4=106 {e x}", 2));
 
-    YAZ_CHECK(tl_query(zh, "@attr 1=4 @and x title", 2));
-
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    YAZ_CHECK(tl_query(zh, "@prox 0 2 1 2 k 2 my x", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @prox 0 2 1 2 k 2 my x", 2));
 
     /* exl=0 distance=2 order=1 relation=2 (<=), known, unit=word */
-    YAZ_CHECK(tl_query(zh, "@prox 0 2 1 2 k 2 x my", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @prox 0 2 1 2 k 2 x my", 0));
 
     /* exl=0 distance=2 order=0 relation=2 (<=), known, unit=word */
-    YAZ_CHECK(tl_query(zh, "@prox 0 2 0 2 k 2 x my", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @prox 0 2 0 2 k 2 x my", 2));
 
     /* exl=0 distance=2 order=0 relation=3 (=), known, unit=word */
-    YAZ_CHECK(tl_query(zh, "@prox 0 2 1 3 k 2 my x", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @prox 0 2 1 3 k 2 my x", 1));
 
     /* exl=1 distance=2 order=0 relation=3 (=), known, unit=word */
-    YAZ_CHECK(tl_query(zh, "@prox 1 2 1 3 k 2 my x", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @prox 1 2 1 3 k 2 my x", 1));
 
     /* provoke unsupported use attribute */
     YAZ_CHECK(tl_query_x(zh, "@attr 1=999 @attr 4=1 x", 0, 114));
@@ -93,7 +117,7 @@ static void tst(int argc, char **argv)
 	       0, 121));
 
     /* provoke unsupported relation */
-    YAZ_CHECK(tl_query_x(zh, "@attr 1=1016 @attr 2=6 x", 0, 117));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=4 @attr 2=6 x", 0, 117));
     YAZ_CHECK(tl_query_x(zh, "@attr 1=1016 @attr 2=6 @attr 4=109 x", 0, 114));
  
     YAZ_CHECK(tl_close_down(zh, zs));
@@ -101,3 +125,11 @@ static void tst(int argc, char **argv)
 
 TL_MAIN
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+