X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ftest_search.c;h=17d540e59d30b1a51dba2c54e4d72f83b04af177;hp=377d6e7181617593d1a3a7d3236b68b80ba01e63;hb=HEAD;hpb=e2e073b5c947e996304ed7d577497af5e9a879ee

diff --git a/test/api/test_search.c b/test/api/test_search.c
index 377d6e7..17d540e 100644
--- a/test/api/test_search.c
+++ b/test/api/test_search.c
@@ -76,6 +76,12 @@ const char *myrec[] = {
         "</title>"
         "</gils>"
         ,
+        "<gils>\n"
+        "<title>"
+        "\xe5" " og vandl" "\xf8" "b"
+        "</title>"
+        "</gils>"
+        ,
 	0} ;
 
 static void tst(int argc, char **argv)
@@ -144,7 +150,7 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 titl", 3));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 titlx", 3));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 titlxx", 0));
-    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 x", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 x", 3));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 le", 0));
     YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 5=103 .*le", 3));
 
@@ -219,18 +225,18 @@ static void tst(int argc, char **argv)
 
 
     /* 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));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=4 x", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=4 tu", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=4 title", 4));
 
     /* 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));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=5 x", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=5 tu", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=5 title", 3));
 
     /* always-matches relation */
-    YAZ_CHECK(tl_query(zh, "@attr 1=_ALLRECORDS @attr 2=103 {ym}", 6));
-    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=103 {x my}", 5));
+    YAZ_CHECK(tl_query(zh, "@attr 1=_ALLRECORDS @attr 2=103 {ym}", 7));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=103 {x my}", 6));
     YAZ_CHECK(tl_query_x(zh, "@attr 1=1 @attr 2=103 {x my}", 0, 114));
 
     /* and searches */
@@ -418,6 +424,9 @@ static void tst(int argc, char **argv)
     /* N=41 and N=49 get only rec2 */
     YAZ_CHECK(tl_query(zh, "@attr 2=3 @attr gils 1=2040 @attr 4=109 \"41 49\" ", 1));
 
+    /* N=41 and N=49, but relevance */
+    YAZ_CHECK(tl_query(zh, "@attr 2=102 @attr gils 1=2040 @attr 4=109 \"41 49\" ", 1));
+
 
     /* = */
     YAZ_CHECK(tl_query(zh, "@attr 1=30 @attr 4=5 @attr 2=3 {2107-09-19 00:00:00}", 1));
@@ -431,6 +440,14 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(tl_query(zh, "@attr 1=30 @attr 4=5 @attr 2=5 {2107-09-19 00:00:00}", 0));
 
 
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 {\xe5" " og vandl" "\xf8" "b}", 1));
+
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 {\xc5" " OG VANDL" "\xd8" "B}", 1));
+
+    /* try equivalent directive */
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 {aa" " OG VANDL" "\xd8" "B}", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 {AA" " OG VANDL" "\xd8" "B}", 0));
+
     YAZ_CHECK(tl_close_down(zh, zs));
 }