X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=dd35a5e4faa452427b6ec0cbccbe50f945f12c5e;hb=7674cd40af86e353235cb1b509f4b4687167cdf2;hp=4957bfb7e94c6487a89e8421ae1971d979709cfe;hpb=8a4ae2667c1cfc7b9f3ef5dfbae1a62573c7ab90;p=yaz-moved-to-github.git diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c index 4957bfb..dd35a5e 100644 --- a/retrieval/d1_marc.c +++ b/retrieval/d1_marc.c @@ -1,10 +1,28 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1997, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_marc.c,v $ - * Revision 1.4 1996-03-25 10:18:03 quinn + * Revision 1.10 1997-09-30 11:50:04 adam + * Added handler data1_get_map_buf that is used by data1_nodetomarc. + * + * Revision 1.9 1997/09/24 13:35:45 adam + * Added two members to data1_marctab to ease reading of weird MARC records. + * + * Revision 1.8 1997/09/17 12:10:37 adam + * YAZ version 1.4. + * + * Revision 1.7 1997/09/05 09:50:57 adam + * Removed global data1_tabpath - uses data1_get_tabpath() instead. + * + * Revision 1.6 1997/09/04 13:51:58 adam + * Added data1 to marc conversion with indicators. + * + * Revision 1.5 1997/09/04 13:48:04 adam + * Added data1 to marc conversion. + * + * Revision 1.4 1996/03/25 10:18:03 quinn * Removed trailing whitespace from data elements * * Revision 1.3 1995/11/01 16:34:57 quinn @@ -27,23 +45,21 @@ #include #include +#include #include #include #include #include -#define ISO2709_RS 035 -#define ISO2709_FS 036 -#define ISO2709_IDFS 037 - -data1_marctab *data1_read_marctab(char *file) +data1_marctab *data1_read_marctab (data1_handle dh, const char *file) { FILE *f; - data1_marctab *res = xmalloc(sizeof(*res)); + NMEM mem = data1_nmem_get (dh); + data1_marctab *res = nmem_malloc(mem, sizeof(*res)); char line[512], *argv[50]; int argc; - 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; @@ -61,6 +77,8 @@ data1_marctab *data1_read_marctab(char *file) strcpy(res->implementation_codes, " "); res->indicator_length = 2; res->identifier_length = 2; + res->force_indicator_length = -1; + res->force_identifier_length = -1; strcpy(res->user_systems, "z "); while ((argc = readconf_line(f, line, 512, argv, 50))) @@ -71,8 +89,7 @@ data1_marctab *data1_read_marctab(char *file) logf(LOG_WARN, "%s: Bad name directive"); continue; } - res->name = xmalloc(strlen(argv[1])+1); - strcpy(res->name, argv[1]); + res->name = nmem_strdup(mem, argv[1]); } else if (!strcmp(argv[0], "reference")) { @@ -124,6 +141,24 @@ data1_marctab *data1_read_marctab(char *file) } strncpy(res->future_use, argv[1], 2); } + else if (!strcmp(argv[0], "force-indicator-length")) + { + if (argc != 2) + { + logf(LOG_WARN, "%s: Bad future-use"); + continue; + } + res->force_indicator_length = atoi(argv[1]); + } + else if (!strcmp(argv[0], "force-identifier-length")) + { + if (argc != 2) + { + logf(LOG_WARN, "%s: Bad future-use"); + continue; + } + res->force_identifier_length = atoi(argv[1]); + } else logf(LOG_WARN, "%s: Bad directive '%s'", file, argv[0]); @@ -156,7 +191,7 @@ static char *get_data(data1_node *n, int *len) static void memint (char *p, int val, int len) { - static char buf[9]; + char buf[10]; if (len == 1) *p = val + '0'; @@ -167,6 +202,19 @@ static void memint (char *p, int val, int len) } } +static int is_indicator (data1_marctab *p, data1_node *subf) +{ +#if 1 + if (p->indicator_length != 2 || + (subf->which == DATA1N_tag && strlen(subf->u.tag.tag) == 2)) + return 1; +#else + if (subf->which == DATA1N_tag && subf->child->which == DATA1N_tag) + return 1; +#endif + return 0; +} + static int nodetomarc(data1_marctab *p, data1_node *n, int selected, char **buf, int *size) { @@ -177,6 +225,7 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, char *op; data1_node *field, *subf; + logf (LOG_DEBUG, "nodetomarc"); for (field = n->child; field; field = field->next) { if (field->which != DATA1N_tag) @@ -192,7 +241,13 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, + p->length_implementation; if (strncmp(field->u.tag.tag, "00", 2)) len += p->indicator_length; /* this is fairly bogus */ - for (subf = field->child; subf; subf = subf->next) + subf = field->child; + + /* we'll allow no indicator if length is not 2 */ + if (is_indicator (p, subf)) + subf = subf->child; + + for (; subf; subf = subf->next) { if (subf->which != DATA1N_tag) { @@ -231,14 +286,23 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, for (field = n->child; field; field = field->next) { int data_0 = data_p; + char *indicator_data = " "; if (selected && !field->u.tag.node_selected) continue; + + subf = field->child; + + if (is_indicator (p, subf)) + { + indicator_data = subf->u.tag.tag; + subf = subf->child; + } if (strncmp(field->u.tag.tag, "00", 2)) /* bogus */ { - memcpy (op + data_p, " ", p->indicator_length); + memcpy (op + data_p, indicator_data, p->indicator_length); data_p += p->indicator_length; } - for (subf = field->child; subf; subf = subf->next) + for (; subf; subf = subf->next) { char *data; @@ -269,11 +333,12 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, return len; } -char *data1_nodetomarc(data1_marctab *p, data1_node *n, int selected, int *len) +char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n, + int selected, int *len) { - static char *buf = 0; - static int size = 0; + int *size; + char **buf = data1_get_map_buf (dh, &size); - *len = nodetomarc(p, n, selected, &buf, &size); - return buf; + *len = nodetomarc(p, n, selected, buf, size); + return *buf; }