X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fcharmap.c;h=96a390ab14b8f230a87e33d0ee8a73fc4f2326aa;hb=d9b85731ab7b965b1ae9bc1c283e39faf10a644a;hp=f4f5920ce789b67f8138e779846124745d9e34a4;hpb=64faa0860b884099c8054599f9dcfa57353165e3;p=idzebra-moved-to-github.git diff --git a/util/charmap.c b/util/charmap.c index f4f5920..96a390a 100644 --- a/util/charmap.c +++ b/util/charmap.c @@ -1,4 +1,4 @@ -/* $Id: charmap.c,v 1.28 2004-03-09 15:12:15 adam Exp $ +/* $Id: charmap.c,v 1.29 2004-07-28 09:47:42 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -42,7 +42,8 @@ typedef unsigned ucs4_t; const char *CHR_UNKNOWN = "\001"; const char *CHR_SPACE = "\002"; -const char *CHR_BASE = "\003"; +const char *CHR_CUT = "\003"; +const char *CHR_BASE = "\005"; struct chrmaptab_info { @@ -354,6 +355,17 @@ static void fun_addspace(const char *s, void *data, int num) (char*) CHR_SPACE, 0); } +/* + * Callback function. + * Add a space-entry to the value space. + */ +static void fun_addcut(const char *s, void *data, int num) +{ + chrmaptab tab = (chrmaptab) data; + tab->input = set_map_string(tab->input, tab->nmem, s, strlen(s), + (char*) CHR_CUT, 0); +} + /* * Create a string containing the mapped characters provided. */ @@ -612,7 +624,7 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, { if (argc != 2) { - logf(LOG_FATAL, "Syntax error in charmap"); + logf(LOG_FATAL, "Syntax error in charmap for space"); ++errors; } if (scan_string(argv[1], t_unicode, t_utf8, @@ -622,6 +634,20 @@ chrmaptab chrmaptab_create(const char *tabpath, const char *name, int map_only, ++errors; } } + else if (!map_only && !yaz_matchstr(argv[0], "cut")) + { + if (argc != 2) + { + logf(LOG_FATAL, "Syntax error in charmap for cut"); + ++errors; + } + if (scan_string(argv[1], t_unicode, t_utf8, + fun_addcut, res, 0) < 0) + { + logf(LOG_FATAL, "Bad cut specification"); + ++errors; + } + } else if (!yaz_matchstr(argv[0], "map")) { chrwork buf;