X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_map.c;h=0d99476f24519e0c3239159071d1edb6b5bef5f6;hp=73792e36bc10881678a313700023d8f383cce39b;hb=88941d4a9e272daca9323cd19bf4829b6d32871b;hpb=a54eb1c1d02d6f7b7eb8e14db4772ebbc5387315 diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c index 73792e3..0d99476 100644 --- a/retrieval/d1_map.c +++ b/retrieval/d1_map.c @@ -4,7 +4,19 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_map.c,v $ - * Revision 1.5 1995-12-12 14:11:31 quinn + * 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 @@ -26,6 +38,7 @@ #include #include #include +#include #include #include @@ -34,7 +47,7 @@ #include #include -#include "d1_map.h" +#include data1_maptab *data1_read_maptab(char *file) { @@ -43,6 +56,7 @@ data1_maptab *data1_read_maptab(char *file) int argc; char *argv[50], line[512]; data1_mapunit **mapp; + int local_numeric = 0; if (!(f = yaz_path_fopen(data1_tabpath, file, "r"))) { @@ -82,6 +96,8 @@ data1_maptab *data1_read_maptab(char *file) res->target_absyn_name = xmalloc(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) @@ -138,21 +154,17 @@ data1_maptab *data1_read_maptab(char *file) (*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); strcpy((*mtp)->value.string, valstr); -#if 0 } -#endif mtp = &(*mtp)->next; } mapp = &(*mapp)->next; @@ -164,10 +176,8 @@ data1_maptab *data1_read_maptab(char *file) return res; } -#if 1 - /* - * 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) @@ -192,7 +202,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) { @@ -226,7 +241,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_node *n, data1_maptab *map, data1_node *res, + NMEM mem) { data1_node *c; data1_mapunit *m; @@ -250,9 +266,9 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res) */ for (mt = m->target_path; mt; mt = mt->next) { - if (!cur || !tagmatch(cur, mt)) + if (!cur || mt->new_field || !tagmatch(cur, mt)) { - cur = data1_mk_node(); + cur = data1_mk_node(mem); cur->which = DATA1N_tag; cur->u.tag.element = 0; cur->u.tag.tag = mt->value.string; @@ -282,129 +298,20 @@ static int map_children(data1_node *n, data1_maptab *map, data1_node *res) break; } } - if (map_children(c, map, res) < 0) + if (map_children(c, map, res, mem) < 0) return -1; } return 0; } - -#else - -/* - * See if the node n is equivalent to the tag t. - */ -static int tagmatch(data1_node *n, data1_maptag *t) -{ - if (n->which != DATA1N_tag) - return 0; - if (n->u.tag.element) - { - if (n->u.tag.element->tag->tagset->type != t->type) - return 0; - if (n->u.tag.element->tag->which == DATA1T_numeric) - { - if (t->which != D1_MAPTAG_numeric) - return 0; - if (n->u.tag.element->tag->value.numeric != t->value.numeric) - return 0; - } - else - { - if (t->which != D1_MAPTAG_string) - return 0; - if (data1_matchstr(n->u.tag.element->tag->value.string, - t->value.string)) - return 0; - } - } - else /* local tag */ - { - char str[10]; - - if (t->type != 3) - return 0; - if (t->which == D1_MAPTAG_numeric) - sprintf(str, "%d", t->value.numeric); - else - strcpy(str, t->value.string); - if (data1_matchstr(n->u.tag.tag, str)) - return 0; - } - return 1; -} - -static int map_elements(data1_node *res, data1_node *n, data1_mapunit *m) -{ - data1_node *c; - - for (c = n->child; c; c = c->next) - { - if (c->which == DATA1N_tag) - { - if (c->u.tag.element && !data1_matchstr(c->u.tag.element->name, - m->source_element_name)) - { - /* Process target path specification */ - data1_maptag *mt; - data1_node *pn = res, *cur = pn->last_child; - - for (mt = m->target_path; mt; mt = mt->next) - { - if (!cur || !tagmatch(cur, mt)) - { - cur = data1_mk_node(); - 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 (!pn->child) - pn->child = cur; - if (pn->last_child) - pn->last_child->next = cur; - pn->last_child = cur; - pn->num_children++; - } - if (mt->next) - pn = cur; - else if (!m->no_data) - { - cur->child = c->child; - cur->num_children = c->num_children; - c->child = 0; - c->num_children = 0; - } - } - } - else if (map_elements(res, c, m) < 0) - return -1; - } - } - return 0; -} - -static int map_record(data1_node *res, data1_node *n, data1_maptab *map) -{ - data1_mapunit *m; - - for (m = map->map; m; m = m->next) - if (map_elements(res, n, m) < 0) - return -1; - return 0; -} - -#endif - /* * Create a (possibly lossy) copy of the given record based on the * 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_node *n, data1_maptab *map, NMEM m) { - data1_node *res = data1_mk_node(); + data1_node *res = data1_mk_node(m); res->which = DATA1N_root; res->u.root.type = map->target_absyn_name; @@ -416,7 +323,7 @@ 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(n, map, res, m) < 0) { data1_free_tree(res); return 0;