/*
- * Copyright (C) 1995-2006, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: siconv.c,v 1.20 2006-04-19 23:46:15 adam Exp $
+ * $Id: siconv.c,v 1.33 2007-01-18 14:45:05 adam Exp $
*/
/**
* \file siconv.c
* is used by YAZ to interface with iconv (if present).
* For systems where iconv is not present, this layer
* provides a few important conversions: UTF-8, MARC-8, Latin-1.
+ *
+ * MARC-8 reference:
+ * http://www.loc.gov/marc/specifications/speccharmarc8.html
*/
#if HAVE_CONFIG_H
#include <config.h>
#endif
+#include <assert.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
#include <iconv.h>
#endif
+
#include <yaz/yaz-util.h>
unsigned long yaz_marc8_1_conv(unsigned char *inp, size_t inbytesleft,
size_t (*write_handle)(yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
int last);
+ size_t (*flush_handle)(yaz_iconv_t cd,
+ char **outbuf, size_t *outbytesleft);
int marc8_esc_mode;
int comb_offset;
unsigned long write_marc8_comb_ch[8];
size_t write_marc8_comb_no;
+ unsigned write_marc8_second_half_char;
unsigned long write_marc8_last;
const char *write_marc8_page_chr;
};
+static struct {
+ unsigned long x1, x2;
+ unsigned y;
+} latin1_comb[] = {
+ { 'A', 0x0300, 0xc0}, /* LATIN CAPITAL LETTER A WITH GRAVE */
+ { 'A', 0x0301, 0xc1}, /* LATIN CAPITAL LETTER A WITH ACUTE */
+ { 'A', 0x0302, 0xc2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+ { 'A', 0x0303, 0xc3}, /* LATIN CAPITAL LETTER A WITH TILDE */
+ { 'A', 0x0308, 0xc4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+ { 'A', 0x030a, 0xc5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+ /* no need for 0xc6 LATIN CAPITAL LETTER AE */
+ { 'C', 0x0327, 0xc7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+ { 'E', 0x0300, 0xc8}, /* LATIN CAPITAL LETTER E WITH GRAVE */
+ { 'E', 0x0301, 0xc9}, /* LATIN CAPITAL LETTER E WITH ACUTE */
+ { 'E', 0x0302, 0xca}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+ { 'E', 0x0308, 0xcb}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+ { 'I', 0x0300, 0xcc}, /* LATIN CAPITAL LETTER I WITH GRAVE */
+ { 'I', 0x0301, 0xcd}, /* LATIN CAPITAL LETTER I WITH ACUTE */
+ { 'I', 0x0302, 0xce}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+ { 'I', 0x0308, 0xcf}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+ { 'N', 0x0303, 0xd1}, /* LATIN CAPITAL LETTER N WITH TILDE */
+ { 'O', 0x0300, 0xd2}, /* LATIN CAPITAL LETTER O WITH GRAVE */
+ { 'O', 0x0301, 0xd3}, /* LATIN CAPITAL LETTER O WITH ACUTE */
+ { 'O', 0x0302, 0xd4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+ { 'O', 0x0303, 0xd5}, /* LATIN CAPITAL LETTER O WITH TILDE */
+ { 'O', 0x0308, 0xd6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+ /* omitted: 0xd7 MULTIPLICATION SIGN */
+ /* omitted: 0xd8 LATIN CAPITAL LETTER O WITH STROKE */
+ { 'U', 0x0300, 0xd9}, /* LATIN CAPITAL LETTER U WITH GRAVE */
+ { 'U', 0x0301, 0xda}, /* LATIN CAPITAL LETTER U WITH ACUTE */
+ { 'U', 0x0302, 0xdb}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+ { 'U', 0x0308, 0xdc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+ { 'Y', 0x0301, 0xdd}, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+ /* omitted: 0xde LATIN CAPITAL LETTER THORN */
+ /* omitted: 0xdf LATIN SMALL LETTER SHARP S */
+ { 'a', 0x0300, 0xe0}, /* LATIN SMALL LETTER A WITH GRAVE */
+ { 'a', 0x0301, 0xe1}, /* LATIN SMALL LETTER A WITH ACUTE */
+ { 'a', 0x0302, 0xe2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+ { 'a', 0x0303, 0xe3}, /* LATIN SMALL LETTER A WITH TILDE */
+ { 'a', 0x0308, 0xe4}, /* LATIN SMALL LETTER A WITH DIAERESIS */
+ { 'a', 0x030a, 0xe5}, /* LATIN SMALL LETTER A WITH RING ABOVE */
+ /* omitted: 0xe6 LATIN SMALL LETTER AE */
+ { 'c', 0x0327, 0xe7}, /* LATIN SMALL LETTER C WITH CEDILLA */
+ { 'e', 0x0300, 0xe8}, /* LATIN SMALL LETTER E WITH GRAVE */
+ { 'e', 0x0301, 0xe9}, /* LATIN SMALL LETTER E WITH ACUTE */
+ { 'e', 0x0302, 0xea}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
+ { 'e', 0x0308, 0xeb}, /* LATIN SMALL LETTER E WITH DIAERESIS */
+ { 'i', 0x0300, 0xec}, /* LATIN SMALL LETTER I WITH GRAVE */
+ { 'i', 0x0301, 0xed}, /* LATIN SMALL LETTER I WITH ACUTE */
+ { 'i', 0x0302, 0xee}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+ { 'i', 0x0308, 0xef}, /* LATIN SMALL LETTER I WITH DIAERESIS */
+ /* omitted: 0xf0 LATIN SMALL LETTER ETH */
+ { 'n', 0x0303, 0xf1}, /* LATIN SMALL LETTER N WITH TILDE */
+ { 'o', 0x0300, 0xf2}, /* LATIN SMALL LETTER O WITH GRAVE */
+ { 'o', 0x0301, 0xf3}, /* LATIN SMALL LETTER O WITH ACUTE */
+ { 'o', 0x0302, 0xf4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+ { 'o', 0x0303, 0xf5}, /* LATIN SMALL LETTER O WITH TILDE */
+ { 'o', 0x0308, 0xf6}, /* LATIN SMALL LETTER O WITH DIAERESIS */
+ /* omitted: 0xf7 DIVISION SIGN */
+ /* omitted: 0xf8 LATIN SMALL LETTER O WITH STROKE */
+ { 'u', 0x0300, 0xf9}, /* LATIN SMALL LETTER U WITH GRAVE */
+ { 'u', 0x0301, 0xfa}, /* LATIN SMALL LETTER U WITH ACUTE */
+ { 'u', 0x0302, 0xfb}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
+ { 'u', 0x0308, 0xfc}, /* LATIN SMALL LETTER U WITH DIAERESIS */
+ { 'y', 0x0301, 0xfd}, /* LATIN SMALL LETTER Y WITH ACUTE */
+ /* omitted: 0xfe LATIN SMALL LETTER THORN */
+ { 'y', 0x0308, 0xff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */
+
+ { 0, 0, 0}
+};
+
static unsigned long yaz_read_ISO8859_1 (yaz_iconv_t cd, unsigned char *inp,
size_t inbytesleft, size_t *no_read)
{
return x;
}
+
static size_t yaz_init_UTF8 (yaz_iconv_t cd, unsigned char *inp,
size_t inbytesleft, size_t *no_read)
{
return 0;
}
-static unsigned long yaz_read_UTF8 (yaz_iconv_t cd, unsigned char *inp,
- size_t inbytesleft, size_t *no_read)
+unsigned long yaz_read_UTF8_char(unsigned char *inp,
+ size_t inbytesleft, size_t *no_read,
+ int *error)
{
unsigned long x = 0;
else if (inp[0] <= 0xbf || inp[0] >= 0xfe)
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
+ *error = YAZ_ICONV_EILSEQ;
}
else if (inp[0] <= 0xdf && inbytesleft >= 2)
{
else
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
+ *error = YAZ_ICONV_EILSEQ;
}
}
else if (inp[0] <= 0xef && inbytesleft >= 3)
else
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
+ *error = YAZ_ICONV_EILSEQ;
}
}
else if (inp[0] <= 0xf7 && inbytesleft >= 4)
else
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
+ *error = YAZ_ICONV_EILSEQ;
}
}
else if (inp[0] <= 0xfb && inbytesleft >= 5)
else
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
+ *error = YAZ_ICONV_EILSEQ;
}
}
else if (inp[0] <= 0xfd && inbytesleft >= 6)
else
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EILSEQ;
+ *error = YAZ_ICONV_EILSEQ;
}
}
else
{
*no_read = 0;
- cd->my_errno = YAZ_ICONV_EINVAL;
+ *error = YAZ_ICONV_EINVAL;
}
return x;
}
+static unsigned long yaz_read_UTF8 (yaz_iconv_t cd, unsigned char *inp,
+ size_t inbytesleft, size_t *no_read)
+{
+ return yaz_read_UTF8_char(inp, inbytesleft, no_read, &cd->my_errno);
+}
+
static unsigned long yaz_read_UCS4 (yaz_iconv_t cd, unsigned char *inp,
size_t inbytesleft, size_t *no_read)
{
return x;
}
-static unsigned long yaz_read_marc8_comb (yaz_iconv_t cd, unsigned char *inp,
- size_t inbytesleft, size_t *no_read,
- int *comb)
+static unsigned long yaz_read_marc8s(yaz_iconv_t cd, unsigned char *inp,
+ size_t inbytesleft, size_t *no_read)
+{
+ unsigned long x = yaz_read_marc8(cd, inp, inbytesleft, no_read);
+ if (x && cd->comb_size == 1)
+ {
+ /* For MARC8s we try to get a Latin-1 page code out of it */
+ int i;
+ for (i = 0; latin1_comb[i].x1; i++)
+ if (cd->comb_x[0] == latin1_comb[i].x2 && x == latin1_comb[i].x1)
+ {
+ *no_read += cd->comb_no_read[0];
+ cd->comb_size = 0;
+ x = latin1_comb[i].y;
+ break;
+ }
+ }
+ return x;
+}
+
+static unsigned long yaz_read_marc8_comb(yaz_iconv_t cd, unsigned char *inp,
+ size_t inbytesleft, size_t *no_read,
+ int *comb)
{
*no_read = 0;
while(inbytesleft >= 1 && inp[0] == 27)
size_t inbytesleft0 = inbytesleft;
inp++;
inbytesleft--;
- while(inbytesleft > 0 && strchr("(,$!", *inp))
+ while(inbytesleft > 0 && strchr("(,$!)-", *inp))
{
inbytesleft--;
inp++;
}
}
-static size_t yaz_write_UTF8 (yaz_iconv_t cd, unsigned long x,
- char **outbuf, size_t *outbytesleft,
- int last)
+static size_t yaz_write_UTF8(yaz_iconv_t cd, unsigned long x,
+ char **outbuf, size_t *outbytesleft,
+ int last)
+{
+ return yaz_write_UTF8_char(x, outbuf, outbytesleft, &cd->my_errno);
+}
+
+size_t yaz_write_UTF8_char(unsigned long x,
+ char **outbuf, size_t *outbytesleft,
+ int *error)
{
unsigned char *outp = (unsigned char *) *outbuf;
}
else
{
- cd->my_errno = YAZ_ICONV_E2BIG; /* not room for output */
+ *error = YAZ_ICONV_E2BIG; /* not room for output */
return (size_t)(-1);
}
*outbuf = (char *) outp;
but since MARC-8 to UTF-8 generates these composed sequence
we get a better chance of a successful MARC-8 -> ISO-8859-1
conversion */
- static struct {
- unsigned long x1, x2;
- unsigned y;
- } latin1_comb[] = {
- { 'A', 0x0300, 0xc0}, /* LATIN CAPITAL LETTER A WITH GRAVE */
- { 'A', 0x0301, 0xc1}, /* LATIN CAPITAL LETTER A WITH ACUTE */
- { 'A', 0x0302, 0xc2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
- { 'A', 0x0303, 0xc3}, /* LATIN CAPITAL LETTER A WITH TILDE */
- { 'A', 0x0308, 0xc4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
- { 'A', 0x030a, 0xc5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */
- /* no need for 0xc6 LATIN CAPITAL LETTER AE */
- { 'C', 0x0327, 0xc7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */
- { 'E', 0x0300, 0xc8}, /* LATIN CAPITAL LETTER E WITH GRAVE */
- { 'E', 0x0301, 0xc9}, /* LATIN CAPITAL LETTER E WITH ACUTE */
- { 'E', 0x0302, 0xca}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
- { 'E', 0x0308, 0xcb}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
- { 'I', 0x0300, 0xcc}, /* LATIN CAPITAL LETTER I WITH GRAVE */
- { 'I', 0x0301, 0xcd}, /* LATIN CAPITAL LETTER I WITH ACUTE */
- { 'I', 0x0302, 0xce}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
- { 'I', 0x0308, 0xcf}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */
- { 'N', 0x0303, 0xd1}, /* LATIN CAPITAL LETTER N WITH TILDE */
- { 'O', 0x0300, 0xd2}, /* LATIN CAPITAL LETTER O WITH GRAVE */
- { 'O', 0x0301, 0xd3}, /* LATIN CAPITAL LETTER O WITH ACUTE */
- { 'O', 0x0302, 0xd4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
- { 'O', 0x0303, 0xd5}, /* LATIN CAPITAL LETTER O WITH TILDE */
- { 'O', 0x0308, 0xd6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
- /* omitted: 0xd7 MULTIPLICATION SIGN */
- /* omitted: 0xd8 LATIN CAPITAL LETTER O WITH STROKE */
- { 'U', 0x0300, 0xd9}, /* LATIN CAPITAL LETTER U WITH GRAVE */
- { 'U', 0x0301, 0xda}, /* LATIN CAPITAL LETTER U WITH ACUTE */
- { 'U', 0x0302, 0xdb}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
- { 'U', 0x0308, 0xdc}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
- { 'Y', 0x0301, 0xdd}, /* LATIN CAPITAL LETTER Y WITH ACUTE */
- /* omitted: 0xde LATIN CAPITAL LETTER THORN */
- /* omitted: 0xdf LATIN SMALL LETTER SHARP S */
- { 'a', 0x0300, 0xe0}, /* LATIN SMALL LETTER A WITH GRAVE */
- { 'a', 0x0301, 0xe1}, /* LATIN SMALL LETTER A WITH ACUTE */
- { 'a', 0x0302, 0xe2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
- { 'a', 0x0303, 0xe3}, /* LATIN SMALL LETTER A WITH TILDE */
- { 'a', 0x0308, 0xe4}, /* LATIN SMALL LETTER A WITH DIAERESIS */
- { 'a', 0x030a, 0xe5}, /* LATIN SMALL LETTER A WITH RING ABOVE */
- /* omitted: 0xe6 LATIN SMALL LETTER AE */
- { 'c', 0x0327, 0xe7}, /* LATIN SMALL LETTER C WITH CEDILLA */
- { 'e', 0x0300, 0xe8}, /* LATIN SMALL LETTER E WITH GRAVE */
- { 'e', 0x0301, 0xe9}, /* LATIN SMALL LETTER E WITH ACUTE */
- { 'e', 0x0302, 0xea}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */
- { 'e', 0x0308, 0xeb}, /* LATIN SMALL LETTER E WITH DIAERESIS */
- { 'i', 0x0300, 0xec}, /* LATIN SMALL LETTER I WITH GRAVE */
- { 'i', 0x0301, 0xed}, /* LATIN SMALL LETTER I WITH ACUTE */
- { 'i', 0x0302, 0xee}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
- { 'i', 0x0308, 0xef}, /* LATIN SMALL LETTER I WITH DIAERESIS */
- /* omitted: 0xf0 LATIN SMALL LETTER ETH */
- { 'n', 0x0303, 0xf1}, /* LATIN SMALL LETTER N WITH TILDE */
- { 'o', 0x0300, 0xf2}, /* LATIN SMALL LETTER O WITH GRAVE */
- { 'o', 0x0301, 0xf3}, /* LATIN SMALL LETTER O WITH ACUTE */
- { 'o', 0x0302, 0xf4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
- { 'o', 0x0303, 0xf5}, /* LATIN SMALL LETTER O WITH TILDE */
- { 'o', 0x0308, 0xf6}, /* LATIN SMALL LETTER O WITH DIAERESIS */
- /* omitted: 0xf7 DIVISION SIGN */
- /* omitted: 0xf8 LATIN SMALL LETTER O WITH STROKE */
- { 'u', 0x0300, 0xf9}, /* LATIN SMALL LETTER U WITH GRAVE */
- { 'u', 0x0301, 0xfa}, /* LATIN SMALL LETTER U WITH ACUTE */
- { 'u', 0x0302, 0xfb}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */
- { 'u', 0x0308, 0xfc}, /* LATIN SMALL LETTER U WITH DIAERESIS */
- { 'y', 0x0301, 0xfd}, /* LATIN SMALL LETTER Y WITH ACUTE */
- /* omitted: 0xfe LATIN SMALL LETTER THORN */
- { 'y', 0x0308, 0xff}, /* LATIN SMALL LETTER Y WITH DIAERESIS */
-
- { 0, 0, 0}
- };
unsigned char *outp = (unsigned char *) *outbuf;
if (cd->compose_char)
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;
char **outbuf, size_t *outbytesleft)
{
unsigned long y = cd->write_marc8_last;
- unsigned char byte, second_half = 0;
+ unsigned char byte;
char out_buf[10];
size_t i, out_no = 0;
for (i = 0; i < cd->write_marc8_comb_no; i++)
{
- byte = cd->write_marc8_comb_ch[i];
- if (byte == 0xEB)
- second_half = 0xEC;
- else if (byte == 0xFA)
- second_half = 0xFB;
-
+ /* all MARC-8 combined characters are simple bytes */
+ byte = (unsigned char )(cd->write_marc8_comb_ch[i]);
*(*outbuf)++ = byte;
(*outbytesleft)--;
}
memcpy(*outbuf, out_buf, out_no);
*outbuf += out_no;
(*outbytesleft) -= out_no;
- if (second_half)
+ if (cd->write_marc8_second_half_char)
{
- *(*outbuf)++ = second_half;
+ *(*outbuf)++ = cd->write_marc8_second_half_char;
(*outbytesleft)--;
}
cd->write_marc8_last = 0;
cd->write_marc8_comb_no = 0;
+ cd->write_marc8_second_half_char = 0;
return 0;
}
-static size_t yaz_write_marc8(yaz_iconv_t cd, unsigned long x,
- char **outbuf, size_t *outbytesleft,
- int last)
+static size_t yaz_write_marc8_2(yaz_iconv_t cd, unsigned long x,
+ char **outbuf, size_t *outbytesleft,
+ int last)
{
int comb = 0;
const char *page_chr = 0;
if (comb)
{
+ if (x == 0x0361)
+ cd->write_marc8_second_half_char = 0xEC;
+ else if (x == 0x0360)
+ cd->write_marc8_second_half_char = 0xFB;
+
if (cd->write_marc8_comb_no < 6)
cd->write_marc8_comb_ch[cd->write_marc8_comb_no++] = y;
}
else
{
size_t r = flush_combos(cd, outbuf, outbytesleft);
+ const char *old_page_chr = cd->write_marc8_page_chr;
if (r)
return r;
- if (strcmp(page_chr, cd->write_marc8_page_chr))
+ if (strcmp(page_chr, old_page_chr))
{
- size_t plen = strlen(page_chr);
+ size_t plen = 0;
+ const char *page_out = page_chr;
- if (*outbytesleft < plen)
+ if (*outbytesleft < 8)
{
cd->my_errno = YAZ_ICONV_E2BIG;
+
return (size_t) (-1);
}
- memcpy(*outbuf, page_chr, plen);
+ cd->write_marc8_page_chr = page_chr;
+
+ if (!strcmp(old_page_chr, "\033p")
+ || !strcmp(old_page_chr, "\033g")
+ || !strcmp(old_page_chr, "\033b"))
+ {
+ /* Technique 1 leave */
+ page_out = "\033s";
+ if (strcmp(page_chr, "\033(B")) /* Not going ASCII page? */
+ {
+ /* Must leave script + enter new page */
+ plen = strlen(page_out);
+ memcpy(*outbuf, page_out, plen);
+ (*outbuf) += plen;
+ (*outbytesleft) -= plen;
+ page_out = page_chr;
+ }
+ }
+ plen = strlen(page_out);
+ memcpy(*outbuf, page_out, plen);
(*outbuf) += plen;
(*outbytesleft) -= plen;
- cd->write_marc8_page_chr = page_chr;
}
cd->write_marc8_last = y;
}
return 0;
}
+static size_t yaz_flush_marc8(yaz_iconv_t cd,
+ char **outbuf, size_t *outbytesleft)
+{
+ if (strcmp(cd->write_marc8_page_chr, "\033(B"))
+ {
+ if (*outbytesleft < 3)
+ {
+ cd->my_errno = YAZ_ICONV_E2BIG;
+ return (size_t) (-1);
+ }
+ memcpy(*outbuf, "\033(B", 3);
+ (*outbuf) += 3;
+ *outbytesleft -= 3;
+ }
+ return 0;
+}
+
+static size_t yaz_write_marc8(yaz_iconv_t cd, unsigned long x,
+ char **outbuf, size_t *outbytesleft,
+ int last)
+{
+ int i;
+ for (i = 0; latin1_comb[i].x1; i++)
+ {
+ if (x == latin1_comb[i].y)
+ {
+ size_t r ;
+ /* save the output pointers .. */
+ char *outbuf0 = *outbuf;
+ size_t outbytesleft0 = *outbytesleft;
+ int last_ch = cd->write_marc8_last;
+
+ r = yaz_write_marc8_2(cd, latin1_comb[i].x1,
+ outbuf, outbytesleft, 0);
+ if (r)
+ return r;
+ r = yaz_write_marc8_2(cd, latin1_comb[i].x2,
+ outbuf, outbytesleft, last);
+ if (r && cd->my_errno == YAZ_ICONV_E2BIG)
+ {
+ /* not enough room. reset output to original values */
+ *outbuf = outbuf0;
+ *outbytesleft = outbytesleft0;
+ cd->write_marc8_last = last_ch;
+ }
+ return r;
+ }
+ }
+ return yaz_write_marc8_2(cd, x, outbuf, outbytesleft, last);
+}
+
+
#if HAVE_WCHAR_H
static size_t yaz_write_wchar_t (yaz_iconv_t cd, unsigned long x,
char **outbuf, size_t *outbytesleft,
cd->write_handle = 0;
cd->read_handle = 0;
cd->init_handle = 0;
+ cd->flush_handle = 0;
cd->my_errno = YAZ_ICONV_UNKNOWN;
- cd->marc8_esc_mode = 'B';
- cd->comb_offset = cd->comb_size = 0;
- cd->compose_char = 0;
-
- cd->write_marc8_comb_no = 0;
- cd->write_marc8_last = 0;
- cd->write_marc8_page_chr = "\033(B";
/* a useful hack: if fromcode has leading @,
the library not use YAZ's own conversions .. */
cd->read_handle = yaz_read_UCS4LE;
else if (!yaz_matchstr(fromcode, "MARC8"))
cd->read_handle = yaz_read_marc8;
+ else if (!yaz_matchstr(fromcode, "MARC8s"))
+ cd->read_handle = yaz_read_marc8s;
#if HAVE_WCHAR_H
else if (!yaz_matchstr(fromcode, "WCHAR_T"))
cd->read_handle = yaz_read_wchar_t;
else if (!yaz_matchstr(tocode, "UCS4LE"))
cd->write_handle = yaz_write_UCS4LE;
else if (!yaz_matchstr(tocode, "MARC8"))
+ {
+ cd->write_handle = yaz_write_marc8;
+ cd->flush_handle = yaz_flush_marc8;
+ }
+ else if (!yaz_matchstr(tocode, "MARC8s"))
+ {
cd->write_handle = yaz_write_marc8;
+ cd->flush_handle = yaz_flush_marc8;
+ }
#if HAVE_WCHAR_H
else if (!yaz_matchstr(tocode, "WCHAR_T"))
cd->write_handle = yaz_write_wchar_t;
size_t yaz_iconv(yaz_iconv_t cd, char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
- char *inbuf0;
+ char *inbuf0 = 0;
size_t r = 0;
#if HAVE_ICONV_H
return r;
}
#endif
- if (inbuf == 0 || *inbuf == 0)
+
+ if (inbuf)
+ inbuf0 = *inbuf;
+
+ if (cd->init_flag)
{
- cd->init_flag = 1;
cd->my_errno = YAZ_ICONV_UNKNOWN;
- return 0;
+ cd->marc8_esc_mode = 'B';
+
+ cd->comb_offset = cd->comb_size = 0;
+ cd->compose_char = 0;
+
+ cd->write_marc8_comb_no = 0;
+ cd->write_marc8_second_half_char = 0;
+ cd->write_marc8_last = 0;
+ cd->write_marc8_page_chr = "\033(B";
+
+ cd->unget_x = 0;
+ cd->no_read_x = 0;
}
- inbuf0 = *inbuf;
if (cd->init_flag)
{
- if (cd->init_handle)
+ if (cd->init_handle && inbuf && *inbuf)
{
- size_t no_read;
+ size_t no_read = 0;
size_t r = (cd->init_handle)(cd, (unsigned char *) *inbuf,
*inbytesleft, &no_read);
if (r)
*inbytesleft -= no_read;
*inbuf += no_read;
}
- cd->init_flag = 0;
- cd->unget_x = 0;
- cd->no_read_x = 0;
}
+ cd->init_flag = 0;
+
while (1)
{
unsigned long x;
size_t no_read;
- if (*inbytesleft == 0)
+ if (cd->unget_x)
{
- r = *inbuf - inbuf0;
- break;
+ x = cd->unget_x;
+ no_read = cd->no_read_x;
}
- if (!cd->unget_x)
+ else if (inbuf && *inbuf)
{
+ if (*inbytesleft == 0)
+ {
+ r = *inbuf - inbuf0;
+ break;
+ }
x = (cd->read_handle)(cd, (unsigned char *) *inbuf, *inbytesleft,
&no_read);
if (no_read == 0)
}
else
{
- x = cd->unget_x;
- no_read = cd->no_read_x;
+ r = 0;
+ if (cd->flush_handle && outbuf && *outbuf)
+ r = (*cd->flush_handle)(cd, outbuf, outbytesleft);
+ if (r == 0)
+ cd->init_flag = 1;
+ break;
}
if (x)
{
projects / yaz-moved-to-github.git / blobdiff