X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_map.c;h=c0d8d9288d6bf95e32e65c941b6768a3509ea352;hp=0d99476f24519e0c3239159071d1edb6b5bef5f6;hb=a7827306d9d9fd634a4b4336944bee781fa61e32;hpb=09127934b3646ba7d5bc0a853b693792d64d3bac diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c index 0d99476..c0d8d92 100644 --- a/retrieval/d1_map.c +++ b/retrieval/d1_map.c @@ -1,10 +1,20 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1997, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_map.c,v $ - * Revision 1.9 1996-06-10 08:56:02 quinn + * Revision 1.12 1997-11-18 09:51:09 adam + * Removed element num_children from data1_node. Minor changes in + * data1 to Explain. + * + * Revision 1.11 1997/09/17 12:10:36 adam + * YAZ version 1.4. + * + * Revision 1.10 1997/09/05 09:50:56 adam + * Removed global data1_tabpath - uses data1_get_tabpath() instead. + * + * Revision 1.9 1996/06/10 08:56:02 quinn * Work on Summary. * * Revision 1.8 1996/05/01 12:45:31 quinn @@ -41,7 +51,6 @@ #include #include -#include #include #include @@ -49,16 +58,17 @@ #include #include -data1_maptab *data1_read_maptab(char *file) +data1_maptab *data1_read_maptab (data1_handle dh, const char *file) { - data1_maptab *res = xmalloc(sizeof(*res)); + NMEM mem = data1_nmem_get (dh); + data1_maptab *res = nmem_malloc(mem, sizeof(*res)); FILE *f; int argc; char *argv[50], line[512]; data1_mapunit **mapp; int local_numeric = 0; - if (!(f = yaz_path_fopen(data1_tabpath, file, "r"))) + if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r"))) { logf(LOG_WARN|LOG_ERRNO, "%s", file); return 0; @@ -93,7 +103,7 @@ data1_maptab *data1_read_maptab(char *file) file); continue; } - res->target_absyn_name = xmalloc(strlen(argv[1])+1); + res->target_absyn_name = nmem_malloc(mem, strlen(argv[1])+1); strcpy(res->target_absyn_name, argv[1]); } else if (!yaz_matchstr(argv[0], "localnumeric")) @@ -106,7 +116,7 @@ data1_maptab *data1_read_maptab(char *file) file); continue; } - res->name = xmalloc(strlen(argv[1])+1); + res->name = nmem_malloc(mem, strlen(argv[1])+1); strcpy(res->name, argv[1]); } else if (!strcmp(argv[0], "map")) @@ -120,13 +130,13 @@ data1_maptab *data1_read_maptab(char *file) file); continue; } - *mapp = xmalloc(sizeof(**mapp)); + *mapp = nmem_malloc(mem, sizeof(**mapp)); (*mapp)->next = 0; if (argc > 3 && !data1_matchstr(argv[3], "nodata")) (*mapp)->no_data = 1; else (*mapp)->no_data = 0; - (*mapp)->source_element_name = xmalloc(strlen(argv[1])+1); + (*mapp)->source_element_name = nmem_malloc(mem, strlen(argv[1])+1); strcpy((*mapp)->source_element_name, argv[1]); mtp = &(*mapp)->target_path; if (*path == '/') @@ -147,7 +157,7 @@ data1_maptab *data1_read_maptab(char *file) fclose(f); return 0; } - *mtp = xmalloc(sizeof(**mtp)); + *mtp = nmem_malloc(mem, sizeof(**mtp)); (*mtp)->next = 0; (*mtp)->type = type; if (np > 2 && !data1_matchstr(parm, "new")) @@ -162,7 +172,7 @@ data1_maptab *data1_read_maptab(char *file) else { (*mtp)->which = D1_MAPTAG_string; - (*mtp)->value.string = xmalloc(strlen(valstr)+1); + (*mtp)->value.string = nmem_malloc(mem, strlen(valstr)+1); strcpy((*mtp)->value.string, valstr); } mtp = &(*mtp)->next; @@ -241,8 +251,8 @@ static int tagmatch(data1_node *n, data1_maptag *t) return 1; } -static int map_children(data1_node *n, data1_maptab *map, data1_node *res, - NMEM mem) +static int map_children(data1_handle dh, data1_node *n, data1_maptab *map, + data1_node *res, NMEM mem) { data1_node *c; data1_mapunit *m; @@ -268,7 +278,7 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res, { if (!cur || mt->new_field || !tagmatch(cur, mt)) { - cur = data1_mk_node(mem); + cur = data1_mk_node (dh, mem); cur->which = DATA1N_tag; cur->u.tag.element = 0; cur->u.tag.tag = mt->value.string; @@ -280,7 +290,6 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res, if (pn->last_child) pn->last_child->next = cur; pn->last_child = cur; - pn->num_children++; } if (mt->next) @@ -289,16 +298,14 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res, { cur->child = c->child; cur->last_child = c->last_child; - cur->num_children = c->num_children; c->child = 0; c->last_child = 0; - c->num_children = 0; } } break; } } - if (map_children(c, map, res, mem) < 0) + if (map_children(dh, c, map, res, mem) < 0) return -1; } return 0; @@ -309,13 +316,14 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res, * table. The new copy will refer back to the data of the original record, * which should not be discarded during the lifetime of the copy. */ -data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m) +data1_node *data1_map_record (data1_handle dh, data1_node *n, + data1_maptab *map, NMEM m) { - data1_node *res = data1_mk_node(m); + data1_node *res = data1_mk_node(dh, m); res->which = DATA1N_root; res->u.root.type = map->target_absyn_name; - if (!(res->u.root.absyn = data1_get_absyn(map->target_absyn_name))) + if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name))) { logf(LOG_WARN, "%s: Failed to load target absyn '%s'", map->name, map->target_absyn_name); @@ -323,9 +331,9 @@ data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m) res->parent = 0; res->root = res; - if (map_children(n, map, res, m) < 0) + if (map_children(dh, n, map, res, m) < 0) { - data1_free_tree(res); + data1_free_tree(dh, res); return 0; } return res;