Added a record for testing of bug #1778.

[yaz-moved-to-github.git] / test / tsticonv.c

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 37d3bbf..f1883b9 100644 (file)
--- a/test/tsticonv.c
+++ b/test/tsticonv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: tsticonv.c,v 1.28 2007-03-19 14:40:07 adam Exp $
+ * $Id: tsticonv.c,v 1.32 2007-10-15 20:45:05 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -76,8 +76,12 @@ static int tst_convert_l(yaz_iconv_t cd, size_t in_len, const char *in_buf,
                 return 0;
         }
         else
+        {
+            yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
             break;
+        }
     }
+
     return compare_buffers("tsticonv 22", 0,
                            expect_len, expect_buf,
                            outbuf - outbuf0, outbuf0);
@@ -104,12 +108,37 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *cmpbuf)
             if (e != YAZ_ICONV_E2BIG)
                 break;
         }
+        else
+        {
+            size_t outbytesleft = sizeof(outbuf);
+            char *outp = outbuf;
+            r = yaz_iconv(cd, 0, 0, &outp, &outbytesleft);
+            wrbuf_write(b, outbuf, outp - outbuf);
+            break;
+        }
     }
     if (wrbuf_len(b) == strlen(cmpbuf) 
         && !memcmp(cmpbuf, wrbuf_buf(b), wrbuf_len(b)))
         ret = 1;
     else
-        yaz_log(YLOG_LOG, "GOT (%.*s)", wrbuf_len(b), wrbuf_buf(b));
+    {
+        WRBUF w = wrbuf_alloc();
+
+        wrbuf_rewind(w);
+        wrbuf_verbose_str(w, buf, strlen(buf));
+        yaz_log(YLOG_LOG, "input %s", wrbuf_cstr(w));
+
+        wrbuf_rewind(w);
+        wrbuf_verbose_str(w, wrbuf_buf(b), wrbuf_len(b));
+        yaz_log(YLOG_LOG, "got %s", wrbuf_cstr(w));
+        
+        wrbuf_rewind(w);
+        wrbuf_verbose_str(w, cmpbuf, strlen(cmpbuf));
+        yaz_log(YLOG_LOG, "exp %s", wrbuf_cstr(w));
+
+        wrbuf_destroy(w);
+    }
+
     wrbuf_destroy(b);
     return ret;
 }
@@ -266,6 +295,9 @@ static void dconvert(int mandatory, const char *tmpcode)
             return;
         r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
         YAZ_CHECK(r != (size_t) (-1));
+
+        r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
+        YAZ_CHECK(r != (size_t) (-1));
         yaz_iconv_close(cd);
         if (r == (size_t) (-1))
             return;
@@ -281,11 +313,19 @@ static void dconvert(int mandatory, const char *tmpcode)
         outbytesleft = sizeof(outbuf1);
         r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
         YAZ_CHECK(r != (size_t) (-1));
+
+        r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
+        if (r == (size_t)(-1))
+        {
+            fprintf(stderr, "failed\n");
+        }
+        YAZ_CHECK(r != (size_t) (-1));
+
         if (r != (size_t)(-1)) 
         {
             ret = compare_buffers("dconvert", i,
                                   strlen(iso_8859_1_a[i]), iso_8859_1_a[i],
-                              sizeof(outbuf1) - outbytesleft, outbuf1);
+                                  sizeof(outbuf1) - outbytesleft, outbuf1);
             YAZ_CHECK(ret);
         }
         yaz_iconv_close(cd);
@@ -435,7 +475,7 @@ static void tst_utf8_to_marc8(void)
     /** Pure ASCII. 12 characters (sizeof(outbuf)) */
     YAZ_CHECK(tst_convert(cd, "Cours de math", "Cours de math"));
 
-    /** Pure ASCII. 13 characters (sizeof(outbuf)) */
+    /** Pure ASCII. 13 characters (sizeof(outbuf)+1) */
     YAZ_CHECK(tst_convert(cd, "Cours de math.", "Cours de math."));
 
     /** UPPERCASE SCANDINAVIAN O */
@@ -464,11 +504,26 @@ static void tst_utf8_to_marc8(void)
                           "\033$1" "\x21\x2B\x3B" "\033(B" "o" ));
 
 
+    /** Ideographic space per ANSI Z39.64 */
+    YAZ_CHECK(tst_convert(cd,
+                          "\xe3\x80\x80" "o",        /* UTF-8 */
+                          "\033$1" "\x21\x23\x21" "\033(B" "o" ));
+
     /** Superscript 0 . bug #642 */
     YAZ_CHECK(tst_convert(cd,
                           "(\xe2\x81\xb0)",        /* UTF-8 */
                           "(\033p0\x1bs)"));
     
+    
+    /** bug #1778 */
+    YAZ_CHECK(tst_convert(cd,
+                          /* offset 0x530 in UTF-8 rec marccol4.u8.marc */
+                          "\xE3\x83\xB3" "\xE3\x82\xBF" 
+                          "\xCC\x84" "\xCC\x84" "\xE3\x83\xBC" /* UTF-8 */,
+                          "\x1B\x24\x31" "\x69\x25\x73"
+                          "\x1B\x28\x42" "\xE5\xE5" "\x1B\x24\x31" 
+                          "\x69\x25\x3F"
+                          "\x69\x21\x3C" "\x1B\x28\x42"));
  
     {
         char *inbuf0 = "\xe2\x81\xb0";