X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft5.c;h=26b64e0ef6c339015d03356d483e21b30af8195f;hb=560208f2fa44eabecd96de83679901f570297d30;hp=0df173479184d47953426211f43f701d25c2c64c;hpb=9f937bde31af9c7d6eb0f1355d884110131fa2b9;p=idzebra-moved-to-github.git

diff --git a/test/api/t5.c b/test/api/t5.c
index 0df1734..26b64e0 100644
--- a/test/api/t5.c
+++ b/test/api/t5.c
@@ -1,4 +1,4 @@
-/* $Id: t5.c,v 1.21 2007-05-14 12:33:33 adam Exp $
+/* $Id: t5.c,v 1.24 2007-12-03 12:57:55 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -20,7 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-/** t5.c: proximity searches */
+/** \file
+    \brief test attributes: proximity and position */
 #include <yaz/test.h>
 #include "testlib.h"
 
@@ -104,6 +105,28 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=106 le", 0));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=106 *le", 3));
 
+    /* string relations, < */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=1 0", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=1 my", 0));
+
+    /* string relations, <= */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=2 my", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=2 mn", 0));
+
+    /* = */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=3 my", 3));
+
+    /* string relations, >= */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=4 x", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=4 tu", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=4 title", 3));
+
+    /* string relations, > */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=5 x", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=5 tu", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=5 title", 2));
+
+    
     /* 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)); 
@@ -167,6 +190,18 @@ static void tst(int argc, char **argv)
     /* exl=1 distance=2 order=0 relation=3 (=), known, unit=word */
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @prox 1 2 1 3 k 2 my x", 1));
 
+    /* Non-indexed numeric use, but specified in bib1.att (bug #1142) */
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=1000 x", 0, 114));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=1000 @attr 14=0 x", 0, 114));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=1000 @attr 14=1 x", 0, 0));
+    /* Non-indexed numeric use and unspecified in bib1.att */
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=999 x", 0, 114));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=999 @attr 14=1 x", 0, 114));
+    /* Non-indexed string use attribute */
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=gyf  x", 0, 114));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=gyf @attr 14=0 x", 0, 114));
+    YAZ_CHECK(tl_query_x(zh, "@attr 1=gyf @attr 14=1 x", 0, 0));
+
     /* provoke unsupported use attribute */
     YAZ_CHECK(tl_query_x(zh, "@attr 1=999 @attr 4=1 x", 0, 114));
     YAZ_CHECK(tl_query_x(zh, "@attr 1=999 @attr 4=6 x", 0, 114));
@@ -186,6 +221,11 @@ static void tst(int argc, char **argv)
     /* provoke unsupported relation */
     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));
+
+    /* position */
+    YAZ_CHECK(tl_query(zh, "@attr 3=1 my", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 3=1 x", 0));
+    YAZ_CHECK(tl_query_x(zh, "@attr 3=4 x", 0, 119));
  
     YAZ_CHECK(tl_close_down(zh, zs));
 }