From bf99dfa4e17281320b4f5016b099f395e6d62965 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 13 Dec 2007 15:43:52 +0000
Subject: [PATCH] ICU test is UTF-8 based.

---
 test/api/t17.c       |   21 +++++++++++++++++----
 test/api/t17.idx     |    4 ++--
 test/api/zebra17.cfg |    5 +++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/test/api/t17.c b/test/api/t17.c
index b945f3d..aafddd2 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.10 2007-12-13 15:43:52 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));
diff --git a/test/api/t17.idx b/test/api/t17.idx
index 922ddbe..390f4a6 100644
--- a/test/api/t17.idx
+++ b/test/api/t17.idx
@@ -1,5 +1,5 @@
 # Zebra indexes as referred to from the *.abs-files.
-#  $Id: t17.idx,v 1.6 2007-12-13 11:09:20 adam Exp $
+#  $Id: t17.idx,v 1.7 2007-12-13 15:43:52 adam Exp $
 #
 
 # Traditional word index
@@ -12,7 +12,7 @@ alwaysmatches 1
 firstinfield 1
 # simplechain dummy
 icuchain words-icu.xml
-# debug 1
+debug 1
 
 # Phrase index
 # Used if completeness is 'complete {sub}field' (@attr 6=2, @attr 6=1)
diff --git a/test/api/zebra17.cfg b/test/api/zebra17.cfg
index 1b4ddde..661cd57 100644
--- a/test/api/zebra17.cfg
+++ b/test/api/zebra17.cfg
@@ -1,12 +1,13 @@
-# $Id: zebra17.cfg,v 1.2 2007-11-06 10:30:00 adam Exp $
+# $Id: zebra17.cfg,v 1.3 2007-12-13 15:43:52 adam Exp $
 profilepath: ${srcdir:-.}:${srcdir:-.}/../../tab
 
 attset: bib1.att
 attset: explain.att
 
-recordType: grs.sgml
+recordType: grs.xml
 
 index: t17.idx
 
 isam: b 
 
+encoding: utf-8
\ No newline at end of file
-- 
1.7.10.4