X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_marc.c;h=e410b7c73741077b04e0ee2bd6930fe04b5d02ad;hb=5b690aebb8dc2d05cad8f668de8fd821a1c231fa;hp=1900855349a7a20437282e1c5e5e91c502001451;hpb=7f3f56b0ee3a395f3570999a6c99a369b9e6a0cb;p=yaz-moved-to-github.git diff --git a/retrieval/d1_marc.c b/retrieval/d1_marc.c index 1900855..e410b7c 100644 --- a/retrieval/d1_marc.c +++ b/retrieval/d1_marc.c @@ -1,70 +1,9 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2002, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: d1_marc.c,v $ - * Revision 1.18 2002-05-27 12:34:24 adam - * Fixed is_indicator - * - * Revision 1.17 2002/04/04 20:49:46 adam - * New functions yaz_is_abspath, yaz_path_fopen_base - * - * Revision 1.16 1999/11/30 13:47:12 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.15 1999/10/21 12:06:29 adam - * Retrieval module no longer uses ctype.h - functions. - * - * Revision 1.14 1999/08/27 09:40:32 adam - * Renamed logf function to yaz_log. Removed VC++ project files. - * - * Revision 1.13 1998/10/13 16:09:52 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.12 1998/02/23 10:57:09 adam - * Take care of integer data nodes as well in conversion. - * - * Revision 1.11 1998/02/11 11:53:35 adam - * Changed code so that it compiles as C++. - * - * 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 - * Making data1 look for tables in data1_tabpath - * - * Revision 1.2 1995/11/01 13:54:48 quinn - * Minor adjustments - * - * Revision 1.1 1995/11/01 11:56:08 quinn - * Added Retrieval (data management) functions en masse. - * - * + * $Id: d1_marc.c,v 1.27 2002-08-28 19:34:50 adam Exp $ */ @@ -205,6 +144,7 @@ data1_marctab *data1_read_marctab (data1_handle dh, const char *file) return res; } + /* * Locate some data under this node. This routine should handle variants * prettily. @@ -213,20 +153,32 @@ static char *get_data(data1_node *n, int *len) { char *r; - while (n->which != DATA1N_data && n->child) - n = n->child; - if (n->which != DATA1N_data || - (n->u.data.what != DATA1I_text && n->u.data.what != DATA1I_num)) + while (n) { - r = "[Structured/included data]"; - *len = strlen(r); - return r; - } + if (n->which == DATA1N_data) + { + int i; + *len = n->u.data.len; - *len = n->u.data.len; - while (*len && d1_isspace(n->u.data.data[*len - 1])) - (*len)--; - return n->u.data.data; + for (i = 0; i<*len; i++) + if (!d1_isspace(n->u.data.data[i])) + break; + while (*len && d1_isspace(n->u.data.data[*len - 1])) + (*len)--; + *len = *len - i; + if (*len > 0) + return n->u.data.data + i; + } + if (n->which == DATA1N_tag) + n = n->child; + else if (n->which == DATA1N_data) + n = n->next; + else + break; + } + r = ""; + *len = strlen(r); + return r; } static void memint (char *p, int val, int len) @@ -255,8 +207,9 @@ static int is_indicator (data1_marctab *p, data1_node *subf) return 0; } -static int nodetomarc(data1_marctab *p, data1_node *n, int selected, - char **buf, int *size) +static int nodetomarc(data1_handle dh, + data1_marctab *p, data1_node *n, int selected, + char **buf, int *size) { int len = 26; int dlen; @@ -266,8 +219,11 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, data1_node *field, *subf; yaz_log (LOG_DEBUG, "nodetomarc"); + for (field = n->child; field; field = field->next) { + int is00X = 0; + if (field->which != DATA1N_tag) { yaz_log(LOG_WARN, "Malformed field composition for marc output."); @@ -275,27 +231,34 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, } if (selected && !field->u.tag.node_selected) continue; + + subf = field->child; + if (!subf) + continue; + len += 4 + p->length_data_entry + p->length_starting + p->length_implementation; base_address += 3 + p->length_data_entry + p->length_starting + p->length_implementation; - if (strncmp(field->u.tag.tag, "00", 2)) - len += p->indicator_length; /* this is fairly bogus */ - subf = field->child; + + if (subf->which == DATA1N_data) + is00X = 1; + if (!data1_is_xmlmode(dh)) + { + if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@")) + is00X = 1; + } + + if (!is00X) + len += p->indicator_length; /* 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) - { - yaz_log(LOG_WARN, - "Malformed subfield composition for marc output."); - return -1; - } - if (strncmp(field->u.tag.tag, "00", 2)) + if (!is00X) len += p->identifier_length; get_data(subf, &dlen); len += dlen; @@ -325,19 +288,31 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, for (field = n->child; field; field = field->next) { + int is00X = 0; + int data_0 = data_p; char *indicator_data = " "; if (selected && !field->u.tag.node_selected) continue; subf = field->child; + if (!subf) + continue; + + if (subf->which == DATA1N_data) + is00X = 1; + if (!data1_is_xmlmode(dh)) + { + if (subf->which == DATA1N_tag && !strcmp(subf->u.tag.tag, "@")) + is00X = 1; + } if (is_indicator (p, subf)) { indicator_data = subf->u.tag.tag; subf = subf->child; } - if (strncmp(field->u.tag.tag, "00", 2)) /* bogus */ + if (!is00X) { memcpy (op + data_p, indicator_data, p->indicator_length); data_p += p->indicator_length; @@ -346,10 +321,15 @@ static int nodetomarc(data1_marctab *p, data1_node *n, int selected, { char *data; - if (strncmp(field->u.tag.tag, "00", 2)) + if (!is00X) { + const char *identifier = "a"; + if (subf->which != DATA1N_tag) + yaz_log(LOG_WARN, "Malformed fields for marc output."); + else + identifier = subf->u.tag.tag; op[data_p] = ISO2709_IDFS; - memcpy (op + data_p+1, subf->u.tag.tag, p->identifier_length-1); + memcpy (op + data_p+1, identifier, p->identifier_length-1); data_p += p->identifier_length; } data = get_data(subf, &dlen); @@ -379,6 +359,9 @@ char *data1_nodetomarc(data1_handle dh, data1_marctab *p, data1_node *n, int *size; char **buf = data1_get_map_buf (dh, &size); - *len = nodetomarc(p, n, selected, buf, size); + n = data1_get_root_tag (dh, n); + if (!n) + return 0; + *len = nodetomarc(dh, p, n, selected, buf, size); return *buf; }