X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmarcdisp.c;h=1f00f410a2ff03d7f578bb380be72333b70ed915;hp=811b84d7cba63a77d869f8c2162b122afd364161;hb=7b4adcc54d64c9196a8c19a7f69c850774b8776b;hpb=1d81a9a4f7d31634552e8f93912b778527bcff00 diff --git a/src/marcdisp.c b/src/marcdisp.c index 811b84d..1f00f41 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -87,7 +87,8 @@ struct yaz_marc_subfield { struct yaz_marc_t_ { WRBUF m_wr; NMEM nmem; - int xml; + int input_format; + int output_format; int debug; int write_using_libxml2; enum yaz_collection_state enable_collection; @@ -103,7 +104,7 @@ struct yaz_marc_t_ { yaz_marc_t yaz_marc_create(void) { yaz_marc_t mt = (yaz_marc_t) xmalloc(sizeof(*mt)); - mt->xml = YAZ_MARC_LINE; + mt->output_format = YAZ_MARC_LINE; mt->debug = 0; mt->write_using_libxml2 = 0; mt->enable_collection = no_collection; @@ -161,6 +162,16 @@ void yaz_marc_add_controlfield_xml(yaz_marc_t mt, const xmlNode *ptr_tag, n->u.controlfield.tag = nmem_text_node_cdata(ptr_tag, mt->nmem); n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem); } + +void yaz_marc_add_controlfield_turbo_xml(yaz_marc_t mt, const char *tag, + const xmlNode *ptr_data) +{ + struct yaz_marc_node *n = yaz_marc_add_node(mt); + n->which = YAZ_MARC_CONTROLFIELD; + n->u.controlfield.tag = tag; + n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem); +} + #endif @@ -244,6 +255,25 @@ void yaz_marc_add_datafield_xml(yaz_marc_t mt, const xmlNode *ptr_tag, /* make subfield_pp the current (last one) */ mt->subfield_pp = &n->u.datafield.subfields; } + +struct yaz_marc_node* yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value) +{ + struct yaz_marc_node *n = yaz_marc_add_node(mt); + n->which = YAZ_MARC_DATAFIELD; + n->u.datafield.tag = tag_value; + n->u.datafield.indicator = 0; + n->u.datafield.subfields = 0; + + /* make subfield_pp the current (last one) */ + mt->subfield_pp = &n->u.datafield.subfields; + return n; +} + +void yaz_marc_datafield_set_indicators(struct yaz_marc_node *n, char *indicator) +{ + n->u.datafield.indicator = indicator; +} + #endif void yaz_marc_add_subfield(yaz_marc_t mt, @@ -503,9 +533,10 @@ int yaz_marc_write_trailer(yaz_marc_t mt, WRBUF wr) { if (mt->enable_collection == collection_second) { - switch(mt->xml) + switch(mt->output_format) { case YAZ_MARC_MARCXML: + case YAZ_MARC_TMARCXML: wrbuf_printf(wr, "\n"); break; case YAZ_MARC_XCHANGE: @@ -523,11 +554,12 @@ void yaz_marc_enable_collection(yaz_marc_t mt) int yaz_marc_write_mode(yaz_marc_t mt, WRBUF wr) { - switch(mt->xml) + switch(mt->output_format) { case YAZ_MARC_LINE: return yaz_marc_write_line(mt, wr); case YAZ_MARC_MARCXML: + case YAZ_MARC_TMARCXML: return yaz_marc_write_marcxml(mt, wr); case YAZ_MARC_XCHANGE: return yaz_marc_write_marcxchange(mt, wr, 0, 0); /* no format, type */ @@ -664,7 +696,10 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, int ret; xmlNode *root_ptr; - ret = yaz_marc_write_xml(mt, &root_ptr, ns, format, type); + if (yaz_marc_get_write_format(mt) == YAZ_MARC_MARCXML) + ret = yaz_marc_write_xml(mt, &root_ptr, ns, format, type); + else // Check for Turbo XML + ret = yaz_marc_write_turbo_xml(mt, &root_ptr, ns, format, type); if (ret == 0) { xmlChar *buf_out; @@ -694,7 +729,10 @@ int yaz_marc_write_marcxml(yaz_marc_t mt, WRBUF wr) /* http://www.loc.gov/marc/bibliographic/ecbdldrd.html#mrcblea */ if (!mt->leader_spec) yaz_marc_modify_leader(mt, 9, "a"); - return yaz_marc_write_marcxml_ns(mt, wr, "http://www.loc.gov/MARC21/slim", + char *name_space = "http://www.loc.gov/MARC21/slim"; + if (mt->output_format == YAZ_MARC_TMARCXML) + name_space = "http://www.indexdata.com/MARC21/turboxml"; + return yaz_marc_write_marcxml_ns(mt, wr, name_space, 0, 0); } @@ -709,17 +747,22 @@ int yaz_marc_write_marcxchange(yaz_marc_t mt, WRBUF wr, #if YAZ_HAVE_XML2 -void addMarcDatafield(xmlNode *record_ptr, xmlNameSpace *ns_record, const char* datafield, int turbo, WRBUF wr_cdata) +void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, xmlNode *record_ptr, xmlNsPtr ns_record, WRBUF wr_cdata, int identifier_length) { + xmlNode *ptr; + struct yaz_marc_subfield *s; + int turbo = mt->output_format == YAZ_MARC_TMARCXML; if (!turbo) { ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST "datafield", 0); xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.datafield.tag); } else { - char *field = "datXXX"; - sprintf(field +3,"%s", n->u.datafield.tag); - ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST "dat", 0); - xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.datafield.tag); + //TODO consider if safe + char field[10]; + field[0] = 'd'; + strncpy(field + 1, n->u.datafield.tag, 3); + field[4] = '\0'; + ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST field, 0); } if (n->u.datafield.indicator) { @@ -729,34 +772,67 @@ void addMarcDatafield(xmlNode *record_ptr, xmlNameSpace *ns_record, const char* char ind_str[6]; char ind_val[2]; - sprintf(ind_str, "ind%d", i+1); ind_val[0] = n->u.datafield.indicator[i]; ind_val[1] = '\0'; - xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val); + if (!turbo) { + sprintf(ind_str, "ind%d", i+1); + xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val); + } + else { + sprintf(ind_str, "i%d", i+1); + xmlNewTextChild(ptr, ns_record, BAD_CAST ind_str, BAD_CAST ind_val); + } } } + WRBUF subfield_name = wrbuf_alloc(); for (s = n->u.datafield.subfields; s; s = s->next) { xmlNode *ptr_subfield; size_t using_code_len = get_subfield_len(mt, s->code_data, identifier_length); wrbuf_rewind(wr_cdata); - wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, - s->code_data + using_code_len); + wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, s->code_data + using_code_len); marc_iconv_reset(mt, wr_cdata); - ptr_subfield = xmlNewTextChild( - ptr, ns_record, - BAD_CAST "subfield", BAD_CAST wrbuf_cstr(wr_cdata)); - wrbuf_rewind(wr_cdata); - wrbuf_iconv_write(wr_cdata, mt->iconv_cd, - s->code_data, using_code_len); - xmlNewProp(ptr_subfield, BAD_CAST "code", - BAD_CAST wrbuf_cstr(wr_cdata)); + if (!turbo) { + ptr_subfield = xmlNewTextChild( + ptr, ns_record, + BAD_CAST "subfield", BAD_CAST wrbuf_cstr(wr_cdata)); + wrbuf_rewind(wr_cdata); + wrbuf_iconv_write(wr_cdata, mt->iconv_cd,s->code_data, using_code_len); + xmlNewProp(ptr_subfield, BAD_CAST "code", + BAD_CAST wrbuf_cstr(wr_cdata)); + } + else { // Turbo format + wrbuf_rewind(subfield_name); + wrbuf_puts(subfield_name, "s"); + // TODO Map special codes to something possible for XML ELEMENT names + if ((s->code_data[0] >= '0' && s->code_data[0] <= '9') || + (s->code_data[0] >= 'a' && s->code_data[0] <= 'z') || + (s->code_data[0] >= 'A' && s->code_data[0] <= 'Z')) + { + wrbuf_iconv_write(subfield_name, mt->iconv_cd,s->code_data, using_code_len); + } + else { + char buffer[2*using_code_len + 1]; + int index; + for (index = 0; index < using_code_len; index++) { + sprintf(buffer + 2*index, "%02X", (unsigned char) s->code_data[index] & 0xFF); + }; + buffer[2*(index+1)] = 0; + wrbuf_puts(subfield_name, "-"); + wrbuf_puts(subfield_name, buffer); + yaz_log(YLOG_WARN, "Using numeric value in element name: %s", buffer); + } + ptr_subfield = xmlNewTextChild(ptr, ns_record, + BAD_CAST wrbuf_cstr(subfield_name), + BAD_CAST wrbuf_cstr(wr_cdata)); + } } + wrbuf_destroy(subfield_name); } -int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr, +int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, const char *ns, const char *format, const char *type) @@ -767,7 +843,7 @@ int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr, xmlNode *record_ptr; xmlNsPtr ns_record; WRBUF wr_cdata = 0; - + int turbo = mt->output_format == YAZ_MARC_TMARCXML; for (n = mt->nodes; n; n = n->next) if (n->which == YAZ_MARC_LEADER) { @@ -800,60 +876,43 @@ int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr, switch(n->which) { case YAZ_MARC_DATAFIELD: - ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST "datafield", 0); - xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.datafield.tag); - if (n->u.datafield.indicator) - { - int i; - for (i = 0; n->u.datafield.indicator[i]; i++) - { - char ind_str[6]; - char ind_val[2]; - - sprintf(ind_str, "ind%d", i+1); - ind_val[0] = n->u.datafield.indicator[i]; - ind_val[1] = '\0'; - xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val); - } - } - for (s = n->u.datafield.subfields; s; s = s->next) - { - xmlNode *ptr_subfield; - size_t using_code_len = get_subfield_len(mt, s->code_data, - identifier_length); - wrbuf_rewind(wr_cdata); - wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, - s->code_data + using_code_len); - marc_iconv_reset(mt, wr_cdata); - ptr_subfield = xmlNewTextChild( - ptr, ns_record, - BAD_CAST "subfield", BAD_CAST wrbuf_cstr(wr_cdata)); - - wrbuf_rewind(wr_cdata); - wrbuf_iconv_write(wr_cdata, mt->iconv_cd, - s->code_data, using_code_len); - xmlNewProp(ptr_subfield, BAD_CAST "code", - BAD_CAST wrbuf_cstr(wr_cdata)); - } + add_marc_datafield_turbo_xml(mt, n, record_ptr, ns_record, wr_cdata, identifier_length); break; case YAZ_MARC_CONTROLFIELD: wrbuf_rewind(wr_cdata); wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, n->u.controlfield.data); marc_iconv_reset(mt, wr_cdata); - ptr = xmlNewTextChild(record_ptr, ns_record, - BAD_CAST "controlfield", - BAD_CAST wrbuf_cstr(wr_cdata)); - - xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.controlfield.tag); + if (!turbo) { + ptr = xmlNewTextChild(record_ptr, ns_record, + BAD_CAST "controlfield", + BAD_CAST wrbuf_cstr(wr_cdata)); + xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.controlfield.tag); + } + else { + // TODO required iconv? + char field[10]; + field[0] = 'c'; + strncpy(field + 1, n->u.controlfield.tag, 3); + field[4] = '\0'; + ptr = xmlNewTextChild(record_ptr, ns_record, + BAD_CAST field, + BAD_CAST wrbuf_cstr(wr_cdata)); + } + break; case YAZ_MARC_COMMENT: ptr = xmlNewComment(BAD_CAST n->u.comment); xmlAddChild(record_ptr, ptr); break; case YAZ_MARC_LEADER: - xmlNewTextChild(record_ptr, ns_record, BAD_CAST "leader", - BAD_CAST n->u.leader); + { + char *field = "leader"; + if (turbo) + field = "l"; + xmlNewTextChild(record_ptr, ns_record, BAD_CAST field, + BAD_CAST n->u.leader); + } break; } } @@ -862,7 +921,7 @@ int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr, } -int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, +int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr, const char *ns, const char *format, const char *type) @@ -906,8 +965,41 @@ int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, switch(n->which) { case YAZ_MARC_DATAFIELD: + ptr = xmlNewChild(record_ptr, ns_record, BAD_CAST "datafield", 0); + xmlNewProp(ptr, BAD_CAST "tag", BAD_CAST n->u.datafield.tag); + if (n->u.datafield.indicator) + { + int i; + for (i = 0; n->u.datafield.indicator[i]; i++) + { + char ind_str[6]; + char ind_val[2]; - addMarcDatafield(record_ptr, ns_record, datafield, turbo, wr_cdata); + sprintf(ind_str, "ind%d", i+1); + ind_val[0] = n->u.datafield.indicator[i]; + ind_val[1] = '\0'; + xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val); + } + } + for (s = n->u.datafield.subfields; s; s = s->next) + { + xmlNode *ptr_subfield; + size_t using_code_len = get_subfield_len(mt, s->code_data, + identifier_length); + wrbuf_rewind(wr_cdata); + wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, + s->code_data + using_code_len); + marc_iconv_reset(mt, wr_cdata); + ptr_subfield = xmlNewTextChild( + ptr, ns_record, + BAD_CAST "subfield", BAD_CAST wrbuf_cstr(wr_cdata)); + + wrbuf_rewind(wr_cdata); + wrbuf_iconv_write(wr_cdata, mt->iconv_cd, + s->code_data, using_code_len); + xmlNewProp(ptr_subfield, BAD_CAST "code", + BAD_CAST wrbuf_cstr(wr_cdata)); + } break; case YAZ_MARC_CONTROLFIELD: wrbuf_rewind(wr_cdata); @@ -935,6 +1027,8 @@ int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, } + + #endif int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) @@ -1096,12 +1190,48 @@ int yaz_marc_decode_buf (yaz_marc_t mt, const char *buf, int bsize, return r; } -void yaz_marc_xml(yaz_marc_t mt, int xmlmode) +void yaz_marc_set_read_format(yaz_marc_t mt, int format) +{ + if (mt) + mt->input_format = format; +} + +int yaz_marc_get_read_format(yaz_marc_t mt) { if (mt) - mt->xml = xmlmode; + return mt->input_format; + return -1; } + +void yaz_marc_set_write_format(yaz_marc_t mt, int format) +{ + if (mt) { + mt->output_format = format; + // Force using libxml2 + if (mt->output_format == YAZ_MARC_TMARCXML) + mt->write_using_libxml2 = 1; + } +} + +int yaz_marc_get_write_format(yaz_marc_t mt) +{ + if (mt) + return mt->output_format; + return -1; +} + + +/** + * Deprecated, use yaz_marc_set_write_format + */ +void yaz_marc_xml(yaz_marc_t mt, int xmlmode) +{ + yaz_marc_set_write_format(mt, xmlmode); +} + + + void yaz_marc_debug(yaz_marc_t mt, int level) { if (mt) @@ -1195,6 +1325,8 @@ int yaz_marc_decode_formatstr(const char *arg) mode = YAZ_MARC_ISO2709; if (!strcmp(arg, "marcxml")) mode = YAZ_MARC_MARCXML; + if (!strcmp(arg, "tmarcxml")) + mode = YAZ_MARC_TMARCXML; if (!strcmp(arg, "marcxchange")) mode = YAZ_MARC_XCHANGE; if (!strcmp(arg, "line")) @@ -1207,6 +1339,12 @@ void yaz_marc_write_using_libxml2(yaz_marc_t mt, int enable) mt->write_using_libxml2 = enable; } +int yaz_marc_is_turbo_format(yaz_marc_t mt) +{ + return mt->output_format == YAZ_MARC_TMARCXML; +} + + /* * Local variables: * c-basic-offset: 4