X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ftest_icu_indexing.c;h=dbe408e474f4167c6f68e542b37b3c7f1ea94c8d;hp=b584451efeb392a025b988b5a229279585c6fad6;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hpb=f0a5d58cd2b27f56e0feabb52c01399540a9fcdc

diff --git a/test/api/test_icu_indexing.c b/test/api/test_icu_indexing.c
index b584451..dbe408e 100644
--- a/test/api/test_icu_indexing.c
+++ b/test/api/test_icu_indexing.c
@@ -45,7 +45,7 @@ const char *myrec[] = {
         "<gils>\n<title>My computer</title>\n</gils>\n",
         "<gils>\n<title>My x computer</title>\n</gils>\n",
         "<gils>\n<title>My computer x</title>\n</gils>\n" ,
-        "<gils>\n<title>" char_ae "</title>\n</gils>\n" ,
+        "<gils>\n<title>" char_ae "rme</title>\n</gils>\n" ,
         "<gils>\n<title>B" char_aring "d</title>\n"
         "<abstract>זיהוי סדר הארועים בסיפור המרד הגדול מאת צביה בן-שלום 提示:直接点击数据库名称,将进入单库检索 Ngày xửa ngày xưa D.W. all wet</abstract>\n</gils>\n" ,
 	0} ;
@@ -65,7 +65,53 @@ static void tst(int argc, char **argv)
  
     YAZ_CHECK(tl_query(zh, "@attr 1=title computer", 3));
 
-    YAZ_CHECK(tl_query(zh, "@attr 1=title @attr 5=1 comput", 3));
+    YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 1=title computer", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 1=title compute", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 1=title computee", 0));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 1=title co", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=2 @attr 1=title computer", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=2 @attr 1=title compute", 0));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=2 @attr 1=title er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=3 @attr 1=title computer", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=3 @attr 1=title compute", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=3 @attr 1=title er", 4));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=3 @attr 1=title ompute", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title com.*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title cm.*er", 0));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title com.*ër", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title com?m.*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title coy?m.*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title co[m].*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title co[mn].*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title co[m-n].*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title co[a-z].*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 @attr 1=title co[a-n].*er", 3));
+
+    YAZ_CHECK(tl_query(zh, "@attr 1=title com.*ër", 0));
+
+    YAZ_CHECK(tl_query(zh, "@attr 1=title @and @attr 5=102 com.*er x", 2));
+
+    YAZ_CHECK(tl_query(zh, "@attr 1=title @and x @attr 5=102 com.*er", 2));
 
     YAZ_CHECK(tl_query(zh, "@attr 1=title .computer.", 3));
 
@@ -75,14 +121,20 @@ static void tst(int argc, char **argv)
 
     YAZ_CHECK(tl_query(zh, "@attr 1=title mY", 3));
 
-    YAZ_CHECK(tl_query(zh, char_ae, 1));
-    YAZ_CHECK(tl_query(zh, char_AE, 1));
+    YAZ_CHECK(tl_query(zh, char_ae "rme", 1));
+    YAZ_CHECK(tl_query(zh, char_AE "RME", 1));
 
     YAZ_CHECK(tl_query(zh, "b" char_aring "d", 1));
     YAZ_CHECK(tl_query(zh, "B" char_Aring "D", 1));
     YAZ_CHECK(tl_query(zh, "b" char_aring1 "d", 1));
     YAZ_CHECK(tl_query(zh, "B" char_Aring1 "D", 1));
 
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 b" char_aring "d", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 b.d", 1));
+
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 " char_ae "rme", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 5=102 " "..rme", 1));
+
     /* Abstract searches . Chinese mostly */
     YAZ_CHECK(tl_query(zh, "@attr 1=abstract בן", 1));
     YAZ_CHECK(tl_query(zh, "@attr 1=abstract צביה", 1));
@@ -98,6 +150,8 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=1 בס", 1));
     YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=1 ב", 1));
 
+    YAZ_CHECK(tl_query(zh, "@attr 1=abstract @attr 5=102 בן", 1));
+    
     /* phrase search */
     YAZ_CHECK(tl_query(zh, "@attr 1=title {my computer}", 2));
     YAZ_CHECK(tl_query(zh, "@attr 1=title @attr 6=1 {my computer}", 2));
@@ -115,7 +169,7 @@ static void tst(int argc, char **argv)
     
     /* scan */
     {   /* word search */
-        const char *ent[] = { char_ae, "B" char_aring "d", "computer", 
+        const char *ent[] = { char_ae "rme", "B" char_aring "d", "computer", 
                               "My", "x", 0 };
         YAZ_CHECK(tl_scan(zh, "@attr 1=title 0", 1, 10, 1, 5, 1, ent));
     }
@@ -126,7 +180,7 @@ static void tst(int argc, char **argv)
     }
 
     {   /* phrase search */
-        const char *ent[] = { char_ae, "B" char_aring "d", "My computer" };
+        const char *ent[] = { char_ae "rme", "B" char_aring "d", "My computer" };
         YAZ_CHECK(tl_scan(zh, "@attr 1=title @attr 6=2 0", 1, 3, 1, 3, 0, ent));
     }