From c7899589e137fd6848870b45f692ab0832b7069a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 12 Mar 2008 08:53:28 +0000 Subject: [PATCH] Fixed bug #2120: Different greek symbols, UTF-8 to MARC-8. The UTF-8 to MARC-8 conversion no longer uses yaz_marc8r_67_conv and the table data associated with it. The table data (albeit small) is still produced. --- src/siconv.c | 8 +------- test/tsticonv.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/siconv.c b/src/siconv.c index e7a0de0..17e3d89 100644 --- a/src/siconv.c +++ b/src/siconv.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: siconv.c,v 1.49 2008-03-05 21:21:22 adam Exp $ + * $Id: siconv.c,v 1.50 2008-03-12 08:53:28 adam Exp $ */ /** * \file siconv.c @@ -1487,12 +1487,6 @@ static unsigned long lookup_marc8(yaz_iconv_t cd, *page_chr = ESC "(B"; return x; } - x = yaz_marc8r_67_conv(inp, inbytesleft, &no_read_sub, comb); - if (x) - { - *page_chr = ESC "g"; - return x; - } x = yaz_marc8r_62_conv(inp, inbytesleft, &no_read_sub, comb); if (x) { diff --git a/test/tsticonv.c b/test/tsticonv.c index b39923b..14129db 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.34 2008-03-05 21:21:22 adam Exp $ + * $Id: tsticonv.c,v 1.35 2008-03-12 08:53:28 adam Exp $ */ #if HAVE_CONFIG_H @@ -530,6 +530,18 @@ static void tst_utf8_to_marc8(void) "\x1B\x28\x42" "\xE5\xE5" "\x1B\x24\x31" "\x69\x25\x3F" "\x69\x21\x3C" "\x1B\x28\x42")); + + + /** bug #2120 */ + YAZ_CHECK(tst_convert(cd, + "\xCE\x94\xCE\xB5\xCF\x84" + "\xCE\xBF\xCF\x81\xCE\xB1" + "\xCE\xBA\xCE\xB7\xCF\x82\x2C", + + "\x1B\x28\x53\x45\x66\x78\x72\x75" + "\x61\x6D\x6A\x77" + "\x1B\x28\x42\x2C" + )); { char *inbuf0 = "\xe2\x81\xb0"; -- 1.7.10.4