Scan test. Using ICU config in 'tab'.

diff --git a/test/api/Makefile.am b/test/api/Makefile.am
index 304b544..1a370e0 100644 (file)
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.44 2007-12-07 14:17:37 adam Exp $
+# $Id: Makefile.am,v 1.45 2007-12-17 12:23:03 adam Exp $
 
 noinst_PROGRAMS = testclient
 testclient_SOURCES = testclient.c 
@@ -9,7 +9,7 @@ check_PROGRAMS = $(simpletests) $(safaritests)
 TESTS = $(check_PROGRAMS)
 
 EXTRA_DIST=zebra.cfg zebra6.cfg zebra8.cfg zebra10.cfg zebra15.cfg safari.cfg \
-       t10.att t10.abs zebra17.cfg t17.idx words-icu.xml phrases-icu.xml
+       t10.att t10.abs zebra17.cfg t17.idx 
 
 noinst_LIBRARIES = libtestlib.a
 

diff --git a/test/api/phrases-icu.xml b/test/api/phrases-icu.xml
deleted file mode 100644 (file)
index 0fe3664..0000000
--- a/test/api/phrases-icu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<icu_chain locale="en">
-  <transform rule="[:Control:] Any-Remove"/>
-  <tokenize rule="s"/>
-  <transform rule="[:Punctuation:] Remove"/>
-  <display/>
-  <casemap rule="l"/>
-</icu_chain>

diff --git a/test/api/t17.c b/test/api/t17.c
index aafddd2..7f47769 100644 (file)
--- a/test/api/t17.c
+++ b/test/api/t17.c
@@ -1,4 +1,4 @@
-/* $Id: t17.c,v 1.10 2007-12-13 15:43:52 adam Exp $
+/* $Id: t17.c,v 1.11 2007-12-17 12:23:03 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -86,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

diff --git a/test/api/words-icu.xml b/test/api/words-icu.xml
deleted file mode 100644 (file)
index 1b0e9e2..0000000
--- a/test/api/words-icu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<icu_chain id="en:word" locale="en">
-  <transform rule="[:Control:] Any-Remove"/>
-  <tokenize rule="l"/>
-  <transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
-  <display/>
-  <casemap rule="l"/>
-</icu_chain>