-/* $Id: charmap.c,v 1.44 2007-01-15 15:10:26 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2009 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
root->target && root->target[0] && root->target[0][0] &&
strcmp((const char *) root->target[0], CHR_UNKNOWN))
{
- yaz_log (YLOG_WARN, "duplicate entry for charmap from '%s'",
- from_0);
+ yaz_log(YLOG_WARN, "duplicate entry for charmap from '%s'",
+ from_0);
}
root->target = (unsigned char **)
nmem_malloc(nmem, sizeof(*root->target)*2);
root->children[i] = 0;
}
if (!(root->children[(unsigned char) *from] =
- set_map_string(root->children[(unsigned char) *from], nmem,
- from + 1, len - 1, to, from_0)))
+ set_map_string(root->children[(unsigned char) *from], nmem,
+ from + 1, len - 1, to, from_0)))
return 0;
}
return root;
(*from)++;
if ((res = find_entry(t->children[(unsigned char) *pos],
- from, len - 1)))
+ from, len - 1)))
return res;
/* no match */
*from = pos;
ucs4_t i = 0;
char fmtstr[8];
- yaz_log (YLOG_DEBUG, "prim_w %.3s", (char *) *s);
+ yaz_log(YLOG_DEBUG, "prim_w %.3s", (char *) *s);
if (**s == '\\' && 1[*s])
{
(*s)++;
c = **s;
++(*s);
}
- yaz_log (YLOG_DEBUG, "out %d", c);
+ yaz_log(YLOG_DEBUG, "out %d", c);
return c;
}
chrwork *arg = (chrwork *) data;
assert(arg->map->input);
- yaz_log (YLOG_DEBUG, "set map %.*s", (int) strlen(s), s);
+ yaz_log(YLOG_DEBUG, "set map %.*s", (int) strlen(s), s);
set_map_string(arg->map->input, arg->map->nmem, s, strlen(s), arg->string,
0);
for (s = arg->string; *s; s++)
- yaz_log (YLOG_DEBUG, " %3d", (unsigned char) *s);
+ yaz_log(YLOG_DEBUG, " %3d", (unsigned char) *s);
}
-static int scan_to_utf8 (yaz_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);
*outbuf++ = *from; /* ISO-8859-1 is OK here */
else
{
- ret = yaz_iconv (t, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ ret = yaz_iconv(t, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+ if (ret != (size_t) (-1))
+ ret = yaz_iconv(t, 0, 0, &outbuf, &outbytesleft);
+
+
if (ret == (size_t) (-1))
{
yaz_log(YLOG_LOG, "from: %2X %2X %2X %2X",
from[0], from[1], from[2], from[3]);
- yaz_log (YLOG_WARN|YLOG_ERRNO, "bad unicode sequence");
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "bad unicode sequence");
return -1;
}
}
size_t ret;
ret = yaz_iconv(t_unicode, &inbuf, &inbytesleft,
&outbuf, &outbytesleft);
+ if (ret != (size_t)(-1))
+ ret = yaz_iconv(t_unicode, 0, 0, &outbuf, &outbytesleft);
+
if (ret == (size_t)(-1))
return -1;
i = (outbuf - (char*) arg)/sizeof(ucs4_t);
s++;
for (c = begin; c <= end; c++)
{
- if (scan_to_utf8 (t_utf8, &c, 1, str, sizeof(str)-1))
+ if (scan_to_utf8(t_utf8, &c, 1, str, sizeof(str)-1))
return -1;
(*fun)(str, data, num ? (*num)++ : 0);
}
while (*s != ')' || s[-1] == '\\')
arg_prim[i++] = zebra_prim_w(&s);
arg_prim[i] = 0;
- if (scan_to_utf8 (t_utf8, arg_prim, zebra_ucs4_strlen(arg_prim), str, sizeof(str)-1))
+ if (scan_to_utf8(t_utf8, arg_prim, zebra_ucs4_strlen(arg_prim), str, sizeof(str)-1))
return -1;
(*fun)(str, data, num ? (*num)++ : 0);
s++;
break;
default:
c = zebra_prim_w(&s);
- if (scan_to_utf8 (t_utf8, &c, 1, str, sizeof(str)-1))
+ if (scan_to_utf8(t_utf8, &c, 1, str, sizeof(str)-1))
return -1;
(*fun)(str, data, num ? (*num)++ : 0);
}
unsigned endian = 31;
const char *ucs4_native = "UCS-4";
- yaz_log (YLOG_DEBUG, "maptab %s open", name);
+ yaz_log(YLOG_DEBUG, "maptab %s open", name);
if (!(f = yaz_fopen(tabpath, name, "r", tabroot)))
{
yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name);
if (*(char*) &endian == 31) /* little endian? */
ucs4_native = "UCS-4LE";
- t_utf8 = yaz_iconv_open ("UTF-8", ucs4_native);
+ t_utf8 = yaz_iconv_open("UTF-8", ucs4_native);
- nmem = nmem_create ();
+ nmem = nmem_create();
res = (chrmaptab) nmem_malloc(nmem, sizeof(*res));
res->nmem = nmem;
res->input = (chr_t_entry *) nmem_malloc(res->nmem, sizeof(*res->input));
nmem_malloc(res->nmem, sizeof(*res->input));
res->input->children[i]->children = 0;
res->input->children[i]->target = (unsigned char **)
- nmem_malloc (res->nmem, 2 * sizeof(unsigned char *));
+ nmem_malloc(res->nmem, 2 * sizeof(unsigned char *));
res->input->children[i]->target[1] = 0;
res->input->children[i]->target[0] = (unsigned char*) CHR_UNKNOWN;
}
/* Original code */
#if 1
if (t_unicode != 0)
- yaz_iconv_close (t_unicode);
- t_unicode = yaz_iconv_open (ucs4_native, argv[1]);
+ 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
#if 0
if (t_utf8 != 0)
yaz_iconv_close(t_utf8);
- t_utf8 = yaz_iconv_open ("UTF-8", argv[1]);
+ t_utf8 = yaz_iconv_open("UTF-8", argv[1]);
#endif
}
else
chrmaptab_destroy(res);
res = 0;
}
- yaz_log (YLOG_DEBUG, "maptab %s close %d errors", name, errors);
+ yaz_log(YLOG_DEBUG, "maptab %s close %d errors", name, errors);
if (t_utf8 != 0)
yaz_iconv_close(t_utf8);
if (t_unicode != 0)
void chrmaptab_destroy(chrmaptab tab)
{
if (tab)
- nmem_destroy (tab->nmem);
+ nmem_destroy(tab->nmem);
}
projects / idzebra-moved-to-github.git / blobdiff