X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fapi%2Ft17.c;h=7f477695a6db836f1fee557ac094644b4acb6f43;hb=ae3c0a40a6a02d0dc7748aba3816aa9ac73f4f67;hp=b945f3de78872ac01b4be40bbf81a67a288c57df;hpb=7336356a8d037e2782e201bcdc48ff4ae2850ae4;p=idzebra-moved-to-github.git

diff --git a/test/api/t17.c b/test/api/t17.c
index b945f3d..7f47769 100644
--- a/test/api/t17.c
+++ b/test/api/t17.c
@@ -1,4 +1,4 @@
-/* $Id: t17.c,v 1.9 2007-12-13 11:09:20 adam Exp $
+/* $Id: t17.c,v 1.11 2007-12-17 12:23:03 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -26,17 +26,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/test.h>
 #include "testlib.h"
 
+/* utf-8 sequences for some characters */
 #define char_ae "\xc3\xa6"
 #define char_AE "\xc3\x86"
+
 #define char_oslash "\xc3\xb8"
 #define char_Oslash "\xc3\x98"
 
+#define char_aring "\xc3\xa5"
+#define char_Aring "\xc3\x85"
+
+#define char_comb_ring_above "\xcc\x8a"
+
+#define char_aring1 "a" char_comb_ring_above
+#define char_Aring1 "A" char_comb_ring_above
+
 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>B" char_aring "d</title>\n</gils>\n" ,
 	0} ;
 	
 static void tst(int argc, char **argv)
@@ -61,9 +71,12 @@ 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));
-#if 0
     YAZ_CHECK(tl_query(zh, char_AE, 1));
-#endif
+
+    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));
 
     /* phrase search */
     YAZ_CHECK(tl_query(zh, "@attr 1=title {my computer}", 2));
@@ -73,8 +86,24 @@ static void tst(int argc, char **argv)
     /* complete-subfield search */
     YAZ_CHECK(tl_query(zh, "@attr 1=title @attr 6=2 {my computer}", 1));
     YAZ_CHECK(tl_query(zh, "@attr 1=title @attr 6=2 {my}", 0));
-
+    
     /* scan */
+    {   /* word search */
+        const char *ent[] = { char_ae, "B" char_aring "d", "computer", 
+                              "My", "x", 0 };
+        YAZ_CHECK(tl_scan(zh, "@attr 1=title 0", 1, 10, 1, 5, 1, ent));
+    }
+
+    {   /* word search */
+        const char *ent[] = { "My", "x", 0 };
+        YAZ_CHECK(tl_scan(zh, "@attr 1=title cp", 1, 10, 1, 2, 1, ent));
+    }
+
+    {   /* phrase search */
+        const char *ent[] = { char_ae, "B" char_aring "d", "My computer" };
+        YAZ_CHECK(tl_scan(zh, "@attr 1=title @attr 6=2 0", 1, 3, 1, 3, 0, ent));
+    }
+
     
     YAZ_CHECK(tl_close_down(zh, zs));
 #endif