X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=7fac3c54dacb3e4eaeb2df4fe4a21ca445d01615;hb=e2ac4b875fbaf0211beae88ef6ccda2f2a4a3e95;hp=338490d94e7230018fcab47bea0d9a8b19ce8cb0;hpb=9dfcbb70828f8d5b524c9bb45852246ae1dd6878;p=yaz-moved-to-github.git

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 338490d..7fac3c5 100644
--- a/test/tsticonv.c
+++ b/test/tsticonv.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tsticonv.c,v 1.23 2006-10-04 16:59:34 mike Exp $
+ * $Id: tsticonv.c,v 1.27 2007-03-17 00:10:41 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -90,19 +90,20 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf)
     char outbuf[12];
     size_t inbytesleft = strlen(buf);
     const char *inp = buf;
-    while (inbytesleft)
+    int rounds = 0;
+    for (rounds = 0; inbytesleft && rounds < sizeof(outbuf); rounds++)
     {
         size_t outbytesleft = sizeof(outbuf);
         char *outp = outbuf;
         size_t r = yaz_iconv(cd, (char**) &inp,  &inbytesleft,
                              &outp, &outbytesleft);
+        wrbuf_write(b, outbuf, outp - outbuf);
         if (r == (size_t) (-1))
         {
             int e = yaz_iconv_error(cd);
             if (e != YAZ_ICONV_E2BIG)
                 break;
         }
-        wrbuf_write(b, outbuf, outp - outbuf);
     }
     if (wrbuf_len(b) == strlen(cmpbuf) 
         && !memcmp(cmpbuf, wrbuf_buf(b), wrbuf_len(b)))
@@ -350,6 +351,11 @@ static void tst_marc8_to_utf8(void)
     /* COMBINING ACUTE ACCENT */
     YAZ_CHECK(tst_convert(cd, "Cours de mathâe", 
                           "Cours de mathe\xcc\x81"));
+
+
+    YAZ_CHECK(tst_convert(cd, "a\xea\x1e", "a\x1e\xcc\x8a"));
+
+    YAZ_CHECK(tst_convert(cd, "a\xea", "a"));
     yaz_iconv_close(cd);
 }
 
@@ -464,9 +470,67 @@ static void tst_utf8_to_marc8(void)
                           "(\033p0\x1bs)"));
     
  
+    {
+        char *inbuf0 = "\xe2\x81\xb0";
+        char *inbuf = inbuf0;
+        size_t inbytesleft = strlen(inbuf);
+        char outbuf0[64];
+        char *outbuf = outbuf0;
+        size_t outbytesleft = sizeof(outbuf0)-1;
+        size_t r;
+#if 0
+        int i;
+#endif
+        r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+        YAZ_CHECK(r != (size_t) (-1));
+
+#if 0
+        *outbuf = '\0';  /* so we know when to stop printing */
+        for (i = 0; outbuf0[i]; i++)
+        {
+            int ch = outbuf0[i] & 0xff;
+            yaz_log(YLOG_LOG, "ch%d %02X %c", i, ch, ch >= ' ' ? ch : '?');
+        }
+#endif
+
+        r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
+        YAZ_CHECK(r != (size_t) (-1));
+        *outbuf = '\0';  /* for strcmp test below and printing */
+#if 0
+        for (i = 0; outbuf0[i]; i++)
+        {
+            int ch = outbuf0[i] & 0xff;
+            yaz_log(YLOG_LOG, "ch%d %02X %c", i, ch, ch >= ' ' ? ch : '?');
+        }
+#endif
+        YAZ_CHECK(strcmp("\033p0\x1bs", outbuf0) == 0);
+    }
+    yaz_iconv_close(cd);
+}
+
+static void tst_advance_to_utf8(void)
+{
+    yaz_iconv_t cd = yaz_iconv_open("utf-8", "advancegreek");
+
+    YAZ_CHECK(cd);
+    if (!cd)
+        return;
+
+    YAZ_CHECK(tst_convert(cd, "Cours ", "Cours "));
     yaz_iconv_close(cd);
 }
 
+static void tst_utf8_to_advance(void)
+{
+    yaz_iconv_t cd = yaz_iconv_open("advancegreek", "utf-8");
+
+    YAZ_CHECK(cd);
+    if (!cd)
+        return;
+
+    YAZ_CHECK(tst_convert(cd, "Cours ", "Cours "));
+    yaz_iconv_close(cd);
+}
 
 static void tst_latin1_to_marc8(void)
 {
@@ -533,6 +597,9 @@ int main (int argc, char **argv)
 
     tst_marc8_to_latin1();
 
+    tst_advance_to_utf8();
+    tst_utf8_to_advance();
+
     tst_utf8_to_marc8();
 
     tst_latin1_to_marc8();