X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_map.c;h=84367af9beaee91666e60ab2b869a41c4685e773;hp=7a5a323d6d52d294082b9dfaab3948c72ba8e93c;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=6517fa53d35512887780fd07de5667940da18a9e diff --git a/retrieval/d1_map.c b/retrieval/d1_map.c index 7a5a323..84367af 100644 --- a/retrieval/d1_map.c +++ b/retrieval/d1_map.c @@ -1,10 +1,29 @@ /* - * Copyright (c) 1995-1997, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_map.c,v $ - * Revision 1.11 1997-09-17 12:10:36 adam + * Revision 1.15 1999-08-27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.14 1998/10/13 16:09:50 adam + * Added support for arbitrary OID's for tagsets, schemas and attribute sets. + * Added support for multiple attribute set references and tagset references + * from an abstract syntax file. + * Fixed many bad logs-calls in routines that read the various + * specifications regarding data1 (*.abs,*.att,...) and made the messages + * consistent whenever possible. + * Added extra 'lineno' argument to function readconf_line. + * + * Revision 1.13 1998/02/11 11:53:35 adam + * Changed code so that it compiles as C++. + * + * 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 @@ -57,8 +76,9 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) { NMEM mem = data1_nmem_get (dh); - data1_maptab *res = nmem_malloc(mem, sizeof(*res)); + data1_maptab *res = (data1_maptab *)nmem_malloc(mem, sizeof(*res)); FILE *f; + int lineno = 0; int argc; char *argv[50], line[512]; data1_mapunit **mapp; @@ -66,28 +86,30 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r"))) { - logf(LOG_WARN|LOG_ERRNO, "%s", file); + yaz_log(LOG_WARN|LOG_ERRNO, "%s", file); return 0; } res->name = 0; - res->target_absyn_ref = ODR_NONE; + res->target_absyn_ref = VAL_NONE; res->map = 0; mapp = &res->map; res->next = 0; - while ((argc = readconf_line(f, line, 512, argv, 50))) + while ((argc = readconf_line(f, &lineno, line, 512, argv, 50))) if (!strcmp(argv[0], "targetref")) { if (argc != 2) { - logf(LOG_WARN, "%s: one argument required for targetref", - file); + yaz_log(LOG_WARN, "%s:%d: Bad # args for targetref", + file, lineno); continue; } - if ((res->target_absyn_ref = oid_getvalbyname(argv[1])) == ODR_NONE) + if ((res->target_absyn_ref = oid_getvalbyname(argv[1])) + == VAL_NONE) { - logf(LOG_WARN, "%s: Unknown reference '%s'", file, argv[1]); + yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'", + file, lineno, argv[1]); continue; } } @@ -95,11 +117,12 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s: one argument required for targetref", - file); + yaz_log(LOG_WARN, "%s:%d: Bad # args for targetname", + file, lineno); continue; } - res->target_absyn_name = nmem_malloc(mem, strlen(argv[1])+1); + res->target_absyn_name = + (char *)nmem_malloc(mem, strlen(argv[1])+1); strcpy(res->target_absyn_name, argv[1]); } else if (!yaz_matchstr(argv[0], "localnumeric")) @@ -108,11 +131,10 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) { if (argc != 2) { - logf(LOG_WARN, "%s: one argument required for name", - file); + yaz_log(LOG_WARN, "%s:%d: Bad # args for name", file, lineno); continue; } - res->name = nmem_malloc(mem, strlen(argv[1])+1); + res->name = (char *)nmem_malloc(mem, strlen(argv[1])+1); strcpy(res->name, argv[1]); } else if (!strcmp(argv[0], "map")) @@ -122,17 +144,18 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) if (argc < 3) { - logf(LOG_WARN, "%s: At least 2 arguments required for map", - file); + yaz_log(LOG_WARN, "%s:%d: Bad # of args for map", + file, lineno); continue; } - *mapp = nmem_malloc(mem, sizeof(**mapp)); + *mapp = (data1_mapunit *)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 = nmem_malloc(mem, strlen(argv[1])+1); + (*mapp)->source_element_name = + (char *)nmem_malloc(mem, strlen(argv[1])+1); strcpy((*mapp)->source_element_name, argv[1]); mtp = &(*mapp)->target_path; if (*path == '/') @@ -148,12 +171,12 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) if ((np = sscanf(path, "(%d,%[^)]):%[^/]", &type, valstr, parm)) < 2) { - logf(LOG_WARN, "%s: Syntax error in map directive: %s", - file, argv[2]); + yaz_log(LOG_WARN, "%s:%d: Syntax error in map " + "directive: %s", file, lineno, argv[2]); fclose(f); return 0; } - *mtp = nmem_malloc(mem, sizeof(**mtp)); + *mtp = (data1_maptag *)nmem_malloc(mem, sizeof(**mtp)); (*mtp)->next = 0; (*mtp)->type = type; if (np > 2 && !data1_matchstr(parm, "new")) @@ -168,7 +191,8 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) else { (*mtp)->which = D1_MAPTAG_string; - (*mtp)->value.string = nmem_malloc(mem, strlen(valstr)+1); + (*mtp)->value.string = + (char *)nmem_malloc(mem, strlen(valstr)+1); strcpy((*mtp)->value.string, valstr); } mtp = &(*mtp)->next; @@ -176,7 +200,8 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) mapp = &(*mapp)->next; } else - logf(LOG_WARN, "%s: Unknown directive '%s'", argv[0]); + yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'", + file, lineno, argv[0]); fclose(f); return res; @@ -286,7 +311,6 @@ static int map_children(data1_handle dh, data1_node *n, data1_maptab *map, if (pn->last_child) pn->last_child->next = cur; pn->last_child = cur; - pn->num_children++; } if (mt->next) @@ -295,10 +319,8 @@ static int map_children(data1_handle dh, data1_node *n, data1_maptab *map, { 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; @@ -324,8 +346,8 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n, res->u.root.type = 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); + yaz_log(LOG_WARN, "%s: Failed to load target absyn '%s'", + map->name, map->target_absyn_name); } res->parent = 0; res->root = res;