In character conversion to MARC-8, use ESC$1 instead ESC(1 to switch to

CJK character(s).

diff --git a/src/siconv.c b/src/siconv.c
index 2082781..8deb714 100644 (file)
--- a/src/siconv.c
+++ b/src/siconv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *

- * $Id: siconv.c,v 1.27 2006-08-28 12:34:41 adam Exp $
+ * $Id: siconv.c,v 1.28 2006-08-30 20:14:51 adam Exp $

  */
 /**
  * \file siconv.c
  */
 /**
  * \file siconv.c

@@ -758,7 +758,7 @@ static unsigned long lookup_marc8(yaz_iconv_t cd,
         x = yaz_marc8r_9_conv(inp, inbytesleft, &no_read_sub, comb);
         if (x)
         {
         x = yaz_marc8r_9_conv(inp, inbytesleft, &no_read_sub, comb);
         if (x)
         {

-            *page_chr = "\033(1";
+            *page_chr = "\033$1";

             return x;
         }
         cd->my_errno = YAZ_ICONV_EILSEQ;
             return x;
         }
         cd->my_errno = YAZ_ICONV_EILSEQ;

diff --git a/test/tsticonv.c b/test/tsticonv.c
index 7941013..e52b95e 100644 (file)
--- a/test/tsticonv.c
+++ b/test/tsticonv.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *

- * $Id: tsticonv.c,v 1.21 2006-08-27 19:04:03 adam Exp $
+ * $Id: tsticonv.c,v 1.22 2006-08-30 20:14:56 adam Exp $

  */
 
 #if HAVE_CONFIG_H
  */
 
 #if HAVE_CONFIG_H

@@ -455,7 +455,7 @@ static void tst_utf8_to_marc8()
     /** Ideographic question mark (Unicode FF1F) */
     YAZ_CHECK(tst_convert(cd,
                           "\xEF\xBC\x9F" "o",        /* UTF-8 */
     /** Ideographic question mark (Unicode FF1F) */
     YAZ_CHECK(tst_convert(cd,
                           "\xEF\xBC\x9F" "o",        /* UTF-8 */

-                          "\033(1" "\x21\x2B\x3B" "\033(B" "o" ));
+                          "\033$1" "\x21\x2B\x3B" "\033(B" "o" ));

 
 
     /** Superscript 0 . bug #642 */
 
 
     /** Superscript 0 . bug #642 */