X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=util%2Fcharmap.c;h=f4f5920ce789b67f8138e779846124745d9e34a4;hb=8c2b1cb07e43a08cf1e0ac844c81d4e066eacf23;hp=011cb39a59dc79db3f8762c9c8e5585674e85fac;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git diff --git a/util/charmap.c b/util/charmap.c index 011cb39..f4f5920 100644 --- a/util/charmap.c +++ b/util/charmap.c @@ -1,5 +1,5 @@ -/* $Id: charmap.c,v 1.25 2002-08-02 19:26:57 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: charmap.c,v 1.28 2004-03-09 15:12:15 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps This file is part of the Zebra server. @@ -31,17 +31,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#if HAVE_ICONV_H -#include -#else -typedef int iconv_t; -static size_t iconv(iconv_t t, char **buf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft) -{ - return -1; -} -#endif - typedef unsigned ucs4_t; #include @@ -255,6 +244,14 @@ unsigned char zebra_prim(char **s) return c; } +static int zebra_ucs4_strlen(ucs4_t *s) +{ + int i = 0; + while (*s++) + i++; + return i; +} + ucs4_t zebra_prim_w(ucs4_t **s) { ucs4_t c; @@ -274,13 +271,16 @@ ucs4_t zebra_prim_w(ucs4_t **s) case 't': c = '\t'; (*s)++; break; case 's': c = ' '; (*s)++; break; case 'x': - fmtstr[0] = (*s)[0]; - fmtstr[1] = (*s)[1]; - fmtstr[2] = (*s)[2]; - fmtstr[3] = 0; - sscanf(fmtstr, "x%2x", &i); - c = i; - *s += 3; break; + if (zebra_ucs4_strlen(*s) >= 3) + { + fmtstr[0] = (*s)[1]; + fmtstr[1] = (*s)[2]; + fmtstr[2] = 0; + sscanf(fmtstr, "%x", &i); + c = i; + *s += 3; + } + break; case '0': case '1': case '2': @@ -291,14 +291,30 @@ ucs4_t zebra_prim_w(ucs4_t **s) case '7': case '8': case '9': - fmtstr[0] = (*s)[0]; - fmtstr[1] = (*s)[1]; - fmtstr[2] = (*s)[2]; - fmtstr[3] = 0; - sscanf(fmtstr, "%3o", &i); - c = i; - *s += 3; + if (zebra_ucs4_strlen(*s) >= 3) + { + fmtstr[0] = (*s)[0]; + fmtstr[1] = (*s)[1]; + fmtstr[2] = (*s)[2]; + fmtstr[3] = 0; + sscanf(fmtstr, "%o", &i); + c = i; + *s += 3; + } break; + case 'L': + if (zebra_ucs4_strlen(*s) >= 5) + { + fmtstr[0] = (*s)[1]; + fmtstr[1] = (*s)[2]; + fmtstr[2] = (*s)[3]; + fmtstr[3] = (*s)[4]; + fmtstr[4] = 0; + sscanf(fmtstr, "%x", &i); + c = i; + *s += 5; + } + break; default: (*s)++; } @@ -383,20 +399,22 @@ static void fun_add_qmap(const char *s, void *data, int num) logf (LOG_DEBUG, " %3d", (unsigned char) *s); } -static int scan_to_utf8 (iconv_t t, ucs4_t *from, size_t inlen, +static int scan_to_utf8 (yaz_iconv_t t, ucs4_t *from, size_t inlen, char *outbuf, size_t outbytesleft) { size_t inbytesleft = inlen * sizeof(ucs4_t); char *inbuf = (char*) from; size_t ret; - if (t == (iconv_t)(-1)) + if (t == 0) *outbuf++ = *from; /* ISO-8859-1 is OK here */ else { - ret = iconv (t, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + ret = yaz_iconv (t, &inbuf, &inbytesleft, &outbuf, &outbytesleft); if (ret == (size_t) (-1)) { + yaz_log(LOG_LOG, "from: %2X %2X %2X %2X", + from[0], from[1], from[2], from[3]); yaz_log (LOG_WARN|LOG_ERRNO, "bad unicode sequence"); return -1; } @@ -406,7 +424,7 @@ static int scan_to_utf8 (iconv_t t, ucs4_t *from, size_t inlen, } static int scan_string(char *s_native, - iconv_t t_unicode, iconv_t t_utf8, + yaz_iconv_t t_unicode, yaz_iconv_t t_utf8, void (*fun)(const char *c, void *data, int num), void *data, int *num) { @@ -415,16 +433,17 @@ static int scan_string(char *s_native, ucs4_t arg[512]; ucs4_t *s0, *s = arg; ucs4_t c, begin, end; - size_t i, j; + size_t i; - if (t_unicode != (iconv_t)(-1)) + if (t_unicode != 0) { char *outbuf = (char *) arg; char *inbuf = s_native; size_t outbytesleft = sizeof(arg)-4; size_t inbytesleft = strlen(s_native); - size_t ret; - ret = iconv(t_unicode, &inbuf, &inbytesleft, &outbuf, &outbytesleft); + size_t ret; + ret = yaz_iconv(t_unicode, &inbuf, &inbytesleft, + &outbuf, &outbytesleft); if (ret == (size_t)(-1)) return -1; i = (outbuf - (char*) arg)/sizeof(ucs4_t); @@ -496,17 +515,16 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, int errors = 0; int argc, num = (int) *CHR_BASE, i; NMEM nmem; - iconv_t t_unicode = (iconv_t)(-1); - iconv_t t_utf8 = (iconv_t)(-1); + yaz_iconv_t t_unicode = 0; + yaz_iconv_t t_utf8 = 0; unsigned endian = 31; const char *ucs4_native = "UCS-4"; if (*(char*) &endian == 31) /* little endian? */ ucs4_native = "UCS-4LE"; -#if HAVE_ICONV_H - t_utf8 = iconv_open ("UTF-8", ucs4_native); -#endif + t_utf8 = yaz_iconv_open ("UTF-8", ucs4_native); + logf (LOG_DEBUG, "maptab %s open", name); if (!(f = yaz_fopen(tabpath, name, "r", tabroot))) { @@ -654,12 +672,27 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, } else if (!yaz_matchstr(argv[0], "encoding")) { -#if HAVE_ICONV_H - if (t_unicode != (iconv_t)(-1)) - iconv_close (t_unicode); - t_unicode = iconv_open (ucs4_native, argv[1]); -#else - logf (LOG_WARN, "Encoding ignored. iconv not installed"); + /* + * Fix me. When t_unicode==0 and use encoding directive in *.chr file the beheviour of the + * zebra need to comment next part of code. + */ + + /* Original code */ +#if 1 + if (t_unicode != 0) + yaz_iconv_close (t_unicode); + t_unicode = yaz_iconv_open (ucs4_native, argv[1]); +#endif + /* + * Fix me. It is additional staff for conversion of characters from local encoding + * of *.chr file to UTF-8 (internal encoding). + * NOTE: The derective encoding must be first directive in *.chr file. + */ + /* For whatever reason Oleg enabled this.. */ +#if 0 + if (t_utf8 != 0) + yaz_iconv_close(t_utf8); + t_utf8 = yaz_iconv_open ("UTF-8", argv[1]); #endif } else @@ -674,12 +707,10 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, res = 0; } logf (LOG_DEBUG, "maptab %s close %d errors", name, errors); -#if HAVE_ICONV_H - if (t_utf8 != (iconv_t)(-1)) - iconv_close(t_utf8); - if (t_unicode != (iconv_t)(-1)) - iconv_close(t_unicode); -#endif + if (t_utf8 != 0) + yaz_iconv_close(t_utf8); + if (t_unicode != 0) + yaz_iconv_close(t_unicode); return res; }