X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_map.c;h=c0d8d9288d6bf95e32e65c941b6768a3509ea352;hp=cec007e5076bc005127767739d65e9eb492e7032;hb=a7827306d9d9fd634a4b4336944bee781fa61e32;hpb=2004bbd9b3bbce5eb8ecc49520255b3d0bf578b9 diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c index cec007e..c0d8d92 100644 --- a/retrieval/d1_map.c +++ b/retrieval/d1_map.c @@ -1,10 +1,42 @@ /* - * 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.2 1995-11-01 13:54:46 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 + * Support use of local tag names in abs file. + * + * Revision 1.7 1995/12/13 13:44:31 quinn + * Modified Data1-system to use nmem + * + * Revision 1.6 1995/12/12 16:37:08 quinn + * Added destroy element to data1_node. + * + * Revision 1.5 1995/12/12 14:11:31 quinn + * More work on the large-record problem. + * + * Revision 1.4 1995/12/11 15:22:37 quinn + * Added last_child field to the node. + * Rewrote schema-mapping. + * + * Revision 1.3 1995/11/01 16:34:56 quinn + * Making data1 look for tables in data1_tabpath + * + * Revision 1.2 1995/11/01 13:54:46 quinn * Minor adjustments * * Revision 1.1 1995/11/01 11:56:08 quinn @@ -16,24 +48,27 @@ #include #include #include +#include #include -#include #include #include +#include #include -#include "d1_map.h" +#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 = fopen(file, "r"))) + if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r"))) { logf(LOG_WARN|LOG_ERRNO, "%s", file); return 0; @@ -68,9 +103,11 @@ 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")) + local_numeric = 1; else if (!strcmp(argv[0], "name")) { if (argc != 2) @@ -79,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")) @@ -93,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 == '/') @@ -109,7 +146,6 @@ data1_maptab *data1_read_maptab(char *file) { int type, np; char valstr[512], parm[512]; - int numval; if (ep) ep++; @@ -121,28 +157,24 @@ 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")) (*mtp)->new_field = 1; else (*mtp)->new_field = 0; -#if 0 - if ((numval = atoi(valstr))) - { + if ((type != 3 || local_numeric) && isdigit(*valstr)) + { (*mtp)->which = D1_MAPTAG_numeric; - (*mtp)->value.numeric = numval; + (*mtp)->value.numeric = atoi(valstr); } else { -#endif (*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); -#if 0 } -#endif mtp = &(*mtp)->next; } mapp = &(*mapp)->next; @@ -155,7 +187,7 @@ data1_maptab *data1_read_maptab(char *file) } /* - * Locate node with givel elementname. + * Locate node with given elementname. * NOTE: This is stupid - we don't find repeats this way. */ static data1_node *find_node(data1_node *p, char *elementname) @@ -180,7 +212,12 @@ static int tagmatch(data1_node *n, data1_maptag *t) return 0; if (n->u.tag.element) { - if (n->u.tag.element->tag->tagset->type != t->type) + if (n->u.tag.element->tag->tagset) + { + if (n->u.tag.element->tag->tagset->type != t->type) + return 0; + } + else if (t->type != 3) return 0; if (n->u.tag.element->tag->which == DATA1T_numeric) { @@ -214,7 +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) +static int map_children(data1_handle dh, data1_node *n, data1_maptab *map, + data1_node *res, NMEM mem) { data1_node *c; data1_mapunit *m; @@ -230,61 +268,44 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res) c->u.tag.element->name)) { data1_node *pn = res; + data1_node *cur = pn->last_child; data1_maptag *mt; - data1_node *l; /* * process the target path specification. */ for (mt = m->target_path; mt; mt = mt->next) { - int match = 0; - data1_node *cur; - data1_node *last; - - for (l = pn->child, last = 0; l; last = l, l = l->next) - if (!match) - match = tagmatch(l, mt); - else - if (!tagmatch(l, mt)) - break; - if (!match || !mt->next || mt->new_field) + if (!cur || mt->new_field || !tagmatch(cur, mt)) { - cur = data1_mk_node(); + cur = data1_mk_node (dh, mem); cur->which = DATA1N_tag; cur->u.tag.element = 0; cur->u.tag.tag = mt->value.string; cur->u.tag.node_selected = 0; cur->parent = pn; cur->root = pn->root; - if (!last) - { - cur->next = pn->child; + if (!pn->child) pn->child = cur; - } - else - { - cur->next = last->next; - last->next = cur; - } - pn->num_children++; + if (pn->last_child) + pn->last_child->next = cur; + pn->last_child = cur; } - else - cur = last ? last : pn->child; - if (mt ->next) + if (mt->next) pn = cur; else if (!m->no_data) { cur->child = c->child; - cur->num_children = c->num_children; + cur->last_child = c->last_child; c->child = 0; - c->num_children = 0; + c->last_child = 0; } } + break; } } - if (map_children(c, map, res) < 0) + if (map_children(dh, c, map, res, mem) < 0) return -1; } return 0; @@ -295,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) +data1_node *data1_map_record (data1_handle dh, data1_node *n, + data1_maptab *map, NMEM m) { - data1_node *res = data1_mk_node(); + 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); @@ -309,10 +331,11 @@ data1_node *data1_map_record(data1_node *n, data1_maptab *map) res->parent = 0; res->root = res; - if (map_children(n, map, res) < 0) + if (map_children(dh, n, map, res, m) < 0) { - data1_free_tree(res); + data1_free_tree(dh, res); return 0; } return res; } +