X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Fcharmap.c;h=1913a5f70ddea57f5cfce0c0aa8c61b81e94505c;hp=bfcd9635ef7a210ca6af23cfcf906fa79b23921c;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hpb=0cac58c528d39e9838a4ee6e3f76bc5ca6bd30bf diff --git a/util/charmap.c b/util/charmap.c index bfcd963..1913a5f 100644 --- a/util/charmap.c +++ b/util/charmap.c @@ -1,5 +1,5 @@ -/* $Id: charmap.c,v 1.36 2005-03-11 17:56:36 adam Exp $ - Copyright (C) 1995-2005 +/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ @@ -46,7 +46,7 @@ const unsigned char CHR_FIELD_BEGIN = '^'; const char *CHR_UNKNOWN = "\001"; const char *CHR_SPACE = "\002"; const char *CHR_CUT = "\003"; -const char *CHR_BASE = "\005"; +const char *CHR_BASE = "\005"; /* CHECK CHR_BASE_CHAR as well */ struct chrmaptab_info { @@ -101,11 +101,12 @@ static chr_t_entry *set_map_string(chr_t_entry *root, NMEM nmem, } if (!len) { - if (!root->target || !root->target[0] || strcmp(root->target[0], to)) + if (!root->target || !root->target[0] || + strcmp((const char *) root->target[0], to)) { if (from_0 && root->target && root->target[0] && root->target[0][0] && - strcmp (root->target[0], CHR_UNKNOWN)) + strcmp((const char *) root->target[0], CHR_UNKNOWN)) { yaz_log (YLOG_WARN, "duplicate entry for charmap from '%s'", from_0); @@ -237,52 +238,11 @@ const char **chr_map_q_input(chrmaptab maptab, const char *chr_map_output(chrmaptab maptab, const char **from, int len) { unsigned char c = ** (unsigned char **) from; - (*from)++; - return (const char*) maptab->output[c]; -} - -unsigned char zebra_prim(char **s) -{ - unsigned char c; - unsigned int i = 0; + const char *out = (const char*) maptab->output[c]; - yaz_log (YLOG_DEBUG, "prim %.3s", *s); - if (**s == '\\') - { - (*s)++; - c = **s; - switch (c) - { - case '\\': c = '\\'; (*s)++; break; - case 'r': c = '\r'; (*s)++; break; - case 'n': c = '\n'; (*s)++; break; - case 't': c = '\t'; (*s)++; break; - case 's': c = ' '; (*s)++; break; - case 'x': sscanf(*s, "x%2x", &i); c = i; *s += 3; break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - sscanf(*s, "%3o", &i); - c = i; - *s += 3; - break; - default: - (*s)++; - } - } - else - { - c = **s; - ++(*s); - } - return c; + if (out) + (*from)++; + return out; } static int zebra_ucs4_strlen(ucs4_t *s) @@ -300,7 +260,7 @@ ucs4_t zebra_prim_w(ucs4_t **s) char fmtstr[8]; yaz_log (YLOG_DEBUG, "prim_w %.3s", (char *) *s); - if (**s == '\\') + if (**s == '\\' && 1[*s]) { (*s)++; c = **s; @@ -533,7 +493,6 @@ static int scan_string(char *s_native, (*fun)(str, data, num ? (*num)++ : 0); } break; - case '[': s++; abort(); break; case '(': ++s; s0 = s; i = 0; @@ -555,8 +514,8 @@ static int scan_string(char *s_native, return 0; } -chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, - const char *tabroot) +chrmaptab chrmaptab_create(const char *tabpath, const char *name, + const char *tabroot) { FILE *f; char line[512], *argv[50]; @@ -570,17 +529,18 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, unsigned endian = 31; const char *ucs4_native = "UCS-4"; - if (*(char*) &endian == 31) /* little endian? */ - ucs4_native = "UCS-4LE"; - - t_utf8 = yaz_iconv_open ("UTF-8", ucs4_native); - yaz_log (YLOG_DEBUG, "maptab %s open", name); if (!(f = yaz_fopen(tabpath, name, "r", tabroot))) { yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", name); return 0; } + + if (*(char*) &endian == 31) /* little endian? */ + ucs4_native = "UCS-4LE"; + + t_utf8 = yaz_iconv_open ("UTF-8", ucs4_native); + nmem = nmem_create (); res = (chrmaptab) nmem_malloc(nmem, sizeof(*res)); res->nmem = nmem; @@ -599,15 +559,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, res->input->children[i]->target = (unsigned char **) nmem_malloc (res->nmem, 2 * sizeof(unsigned char *)); res->input->children[i]->target[1] = 0; - if (map_only) - { - res->input->children[i]->target[0] = (unsigned char *) - nmem_malloc (res->nmem, 2 * sizeof(unsigned char)); - res->input->children[i]->target[0][0] = i; - res->input->children[i]->target[0][1] = 0; - } - else - res->input->children[i]->target[0] = (unsigned char*) CHR_UNKNOWN; + res->input->children[i]->target[0] = (unsigned char*) CHR_UNKNOWN; } res->q_input = (chr_t_entry *) nmem_malloc(res->nmem, sizeof(*res->q_input)); @@ -621,7 +573,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, res->base_uppercase = 0; while (!errors && (argc = readconf_line(f, &lineno, line, 512, argv, 50))) - if (!map_only && !yaz_matchstr(argv[0], "lowercase")) + if (!yaz_matchstr(argv[0], "lowercase")) { if (argc != 2) { @@ -639,7 +591,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, res->output[(int) *CHR_UNKNOWN + num] = (unsigned char*) "@"; num = (int) *CHR_BASE; } - else if (!map_only && !yaz_matchstr(argv[0], "uppercase")) + else if (!yaz_matchstr(argv[0], "uppercase")) { if (!res->base_uppercase) { @@ -658,7 +610,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, ++errors; } } - else if (!map_only && !yaz_matchstr(argv[0], "space")) + else if (!yaz_matchstr(argv[0], "space")) { if (argc != 2) { @@ -672,7 +624,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, ++errors; } } - else if (!map_only && !yaz_matchstr(argv[0], "cut")) + else if (!yaz_matchstr(argv[0], "cut")) { if (argc != 2) { @@ -814,3 +766,11 @@ void chrmaptab_destroy(chrmaptab tab) } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +