X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftsticonv.c;h=f1883b96cc0a8c532d2d6c5ab8504888740dad9f;hb=9edd0f41a0323104c2632c2291eae336ab60874c;hp=33b99449a724f48e99eb2283396269ca56b54180;hpb=d38ee71c31b49ad13164039140ed47d18e9432cb;p=yaz-moved-to-github.git

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 33b9944..f1883b9 100644
--- 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.29 2007-03-20 21:37:32 adam Exp $
+ * $Id: tsticonv.c,v 1.32 2007-10-15 20:45:05 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -121,7 +121,24 @@ static int tst_convert(yaz_iconv_t cd, const char *buf, const char *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;
 }
@@ -458,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 */
@@ -487,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";