X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_map.c;h=151b3c489d07f72e101d26b6fe7f2e22eea1df52;hb=12c6db025bffd23e760ceb31120468cf363256df;hp=f8a160b57ca987efdbd8cb930d001e93e9b2e6b5;hpb=02266b68e2e2c86d8a8467ee56721926b365d2d0;p=idzebra-moved-to-github.git diff --git a/data1/d1_map.c b/data1/d1_map.c index f8a160b..151b3c4 100644 --- a/data1/d1_map.c +++ b/data1/d1_map.c @@ -1,4 +1,4 @@ -/* $Id: d1_map.c,v 1.2 2002-10-22 13:19:50 adam Exp $ +/* $Id: d1_map.c,v 1.5 2004-09-28 10:43:37 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -28,8 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include -#include +#include data1_maptab *data1_read_maptab (data1_handle dh, const char *file) { @@ -278,8 +277,27 @@ static int map_children(data1_handle dh, data1_node *n, data1_maptab *map, { if (!cur || mt->new_field || !tagmatch(cur, mt)) { - cur = data1_mk_node2 (dh, mem, DATA1N_tag, pn); - cur->u.tag.tag = mt->value.string; + if (mt->which == D1_MAPTAG_string) + { + cur = data1_mk_node2 (dh, mem, DATA1N_tag, pn); + cur->u.tag.tag = mt->value.string; + } + else if (mt->which == D1_MAPTAG_numeric) + { + data1_tag *tag = + data1_gettagbynum( + dh, + pn->root->u.root.absyn->tagset, + mt->type, + mt->value.numeric); + + if (tag && tag->names->name) + { + cur = data1_mk_tag ( + dh, mem, tag->names->name, 0, pn); + + } + } } if (mt->next)