X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmarcdisp.c;h=50447bed9460ceb1dbab97752b536adafdd03f81;hp=25617278ba7916182c08411cc2905d552f4ec52a;hb=887a9c6336d4731d898e185b5bd08cc6424114a8;hpb=df5c44e0977db702ebc177790d0e4ad87b73f8bd diff --git a/src/marcdisp.c b/src/marcdisp.c index 2561727..50447be 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. */ @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -87,7 +86,6 @@ struct yaz_marc_subfield { struct yaz_marc_t_ { WRBUF m_wr; NMEM nmem; - int input_format; int output_format; int debug; int write_using_libxml2; @@ -141,7 +139,12 @@ static void marc_iconv_reset(yaz_marc_t mt, WRBUF wr) static int marc_exec_leader(const char *leader_spec, char *leader, size_t size); - +#if YAZ_HAVE_XML2 +static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, + const char *ns, + const char *format, + const char *type); +#endif static struct yaz_marc_node *yaz_marc_add_node(yaz_marc_t mt) { @@ -163,8 +166,8 @@ void yaz_marc_add_controlfield_xml(yaz_marc_t mt, const xmlNode *ptr_tag, n->u.controlfield.data = nmem_text_node_cdata(ptr_data, mt->nmem); } -void yaz_marc_add_controlfield_turbo_xml(yaz_marc_t mt, char *tag, - const xmlNode *ptr_data) +void yaz_marc_add_controlfield_xml2(yaz_marc_t mt, char *tag, + const xmlNode *ptr_data) { struct yaz_marc_node *n = yaz_marc_add_node(mt); n->which = YAZ_MARC_CONTROLFIELD; @@ -241,31 +244,40 @@ void yaz_marc_add_datafield(yaz_marc_t mt, const char *tag, mt->subfield_pp = &n->u.datafield.subfields; } -char *element_name_encode(yaz_marc_t mt, WRBUF buffer, char *code_data, size_t code_len) { - // TODO Map special codes to something possible for XML ELEMENT names - - int encode = 0; - int index = 0; - for (index = 0; index < code_len; index++) { - if (!((code_data[index] >= '0' && code_data[index] <= '9') || - (code_data[index] >= 'a' && code_data[index] <= 'z') || - (code_data[index] >= 'A' && code_data[index] <= 'Z'))) - encode = 1; - } - if (!encode) { - wrbuf_iconv_write(buffer, mt->iconv_cd, code_data, code_len); - } - else { - char temp[2*code_len + 1]; - wrbuf_puts(buffer, "-"); - int index; - for (index = 0; index < code_len; index++) { - sprintf(temp+2*index, "%02X", (unsigned char) code_data[index] & 0xFF); - }; - temp[2*code_len+1] = 0; - wrbuf_puts(buffer, temp); - yaz_log(YLOG_WARN, "Using numeric value in element name: %s", temp); - } +/** \brief adds a attribute value to the element name if it is plain chars + + If not, and if the attribute name is not null, it will append a + attribute element with the value if attribute name is null it will + return a non-zero value meaning it couldnt handle the value. +*/ +static int element_name_append_attribute_value( + yaz_marc_t mt, WRBUF buffer, + const char *attribute_name, char *code_data, size_t code_len) +{ + /* TODO Map special codes to something possible for XML ELEMENT names */ + + int encode = 0; + int index = 0; + int success = 0; + for (index = 0; index < code_len; index++) + { + if (!((code_data[index] >= '0' && code_data[index] <= '9') || + (code_data[index] >= 'a' && code_data[index] <= 'z') || + (code_data[index] >= 'A' && code_data[index] <= 'Z'))) + encode = 1; + } + /* Add as attribute */ + if (encode && attribute_name) + wrbuf_printf(buffer, " %s=\"", attribute_name); + + if (!encode || attribute_name) + wrbuf_iconv_write_cdata(buffer, mt->iconv_cd, code_data, code_len); + else + success = -1; + + if (encode && attribute_name) + wrbuf_printf(buffer, "\""); /* return error if we couldn't handle it.*/ + return success; } #if YAZ_HAVE_XML2 @@ -283,7 +295,7 @@ void yaz_marc_add_datafield_xml(yaz_marc_t mt, const xmlNode *ptr_tag, mt->subfield_pp = &n->u.datafield.subfields; } -void yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value, char *indicators) +void yaz_marc_add_datafield_xml2(yaz_marc_t mt, char *tag_value, char *indicators) { struct yaz_marc_node *n = yaz_marc_add_node(mt); n->which = YAZ_MARC_DATAFIELD; @@ -291,7 +303,7 @@ void yaz_marc_add_datafield_turbo_xml(yaz_marc_t mt, char *tag_value, char *indi n->u.datafield.indicator = indicators; n->u.datafield.subfields = 0; - // make subfield_pp the current (last one) + /* make subfield_pp the current (last one) */ mt->subfield_pp = &n->u.datafield.subfields; } @@ -562,7 +574,7 @@ int yaz_marc_write_trailer(yaz_marc_t mt, WRBUF wr) switch(mt->output_format) { case YAZ_MARC_MARCXML: - case YAZ_MARC_TMARCXML: + case YAZ_MARC_TURBOMARC: wrbuf_printf(wr, "\n"); break; case YAZ_MARC_XCHANGE: @@ -585,8 +597,9 @@ int yaz_marc_write_mode(yaz_marc_t mt, WRBUF wr) 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_TURBOMARC: + return yaz_marc_write_turbomarc(mt, wr); case YAZ_MARC_XCHANGE: return yaz_marc_write_marcxchange(mt, wr, 0, 0); /* no format, type */ case YAZ_MARC_ISO2709: @@ -597,33 +610,33 @@ int yaz_marc_write_mode(yaz_marc_t mt, WRBUF wr) return -1; } -const char *collection_name[2] = { "collection", "collection"}; -const char *record_name[2] = { "record", "r"}; -const char *leader_name[2] = { "leader", "l"}; -const char *controlfield_name[2]= { "controlfield", "c"}; -const char *datafield_name[2] = { "datafield", "d"}; -const char *indicator_name[2] = { "ind", "i"}; -const char *subfield_name[2] = { "subfield", "s"}; - +static const char *record_name[2] = { "record", "r"}; +static const char *leader_name[2] = { "leader", "l"}; +static const char *controlfield_name[2] = { "controlfield", "c"}; +static const char *datafield_name[2] = { "datafield", "d"}; +static const char *indicator_name[2] = { "ind", "i"}; +static const char *subfield_name[2] = { "subfield", "s"}; -/** \brief common MARC XML/Xchange writer +/** \brief common MARC XML/Xchange/turbomarc writer \param mt handle \param wr WRBUF output \param ns XMLNS for the elements \param format record format (e.g. "MARC21") \param type record type (e.g. "Bibliographic") + \param turbo =1 for turbomarc + \retval 0 OK + \retval -1 failure */ -static int yaz_marc_write_marcxml_ns1(yaz_marc_t mt, WRBUF wr, - const char *ns, - const char *format, - const char *type) +static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr, + const char *ns, + const char *format, + const char *type, + int turbo) { struct yaz_marc_node *n; int identifier_length; const char *leader = 0; - int turbo = yaz_marc_get_write_format(mt) == YAZ_MARC_TMARCXML; - for (n = mt->nodes; n; n = n->next) if (n->which == YAZ_MARC_LEADER) { @@ -638,8 +651,9 @@ static int yaz_marc_write_marcxml_ns1(yaz_marc_t mt, WRBUF wr, if (mt->enable_collection != no_collection) { - if (mt->enable_collection == collection_first) { - wrbuf_printf(wr, "<%s xmlns=\"%s\">\n", collection_name[turbo], ns); + if (mt->enable_collection == collection_first) + { + wrbuf_printf(wr, "\n", ns); mt->enable_collection = collection_second; } wrbuf_printf(wr, "<%s", record_name[turbo]); @@ -661,186 +675,84 @@ static int yaz_marc_write_marcxml_ns1(yaz_marc_t mt, WRBUF wr, { case YAZ_MARC_DATAFIELD: - wrbuf_printf(wr, " <%s", datafield_name[turbo]); + wrbuf_printf(wr, " <%s", datafield_name[turbo]); if (!turbo) wrbuf_printf(wr, " tag=\""); wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.datafield.tag, strlen(n->u.datafield.tag)); - if (!turbo) - wrbuf_printf(wr, "\""); + if (!turbo) + wrbuf_printf(wr, "\""); if (n->u.datafield.indicator) { int i; for (i = 0; n->u.datafield.indicator[i]; i++) { - wrbuf_printf(wr, " %s%d=\"", indicator_name[turbo], i+1); - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, - n->u.datafield.indicator+i, 1); - wrbuf_iconv_puts(wr, mt->iconv_cd, "\""); - } + wrbuf_printf(wr, " %s%d=\"", indicator_name[turbo], i+1); + wrbuf_iconv_write_cdata(wr, mt->iconv_cd, + n->u.datafield.indicator+i, 1); + wrbuf_iconv_puts(wr, mt->iconv_cd, "\""); + } } - wrbuf_printf(wr, ">\n"); + wrbuf_printf(wr, ">\n"); for (s = n->u.datafield.subfields; s; s = s->next) { size_t using_code_len = get_subfield_len(mt, s->code_data, identifier_length); wrbuf_printf(wr, " <%s", subfield_name[turbo]); - if (!turbo) { - wrbuf_printf(wr, " code=\""); - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, - s->code_data, using_code_len); - wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); - } else { - element_name_encode(mt, wr, s->code_data, using_code_len); - wrbuf_puts(wr, ">"); - } + if (!turbo) + { + wrbuf_printf(wr, " code=\""); + wrbuf_iconv_write_cdata(wr, mt->iconv_cd, + s->code_data, using_code_len); + wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); + } + else + { + element_name_append_attribute_value(mt, wr, "code", s->code_data, using_code_len); + wrbuf_puts(wr, ">"); + } wrbuf_iconv_write_cdata(wr, mt->iconv_cd, s->code_data + using_code_len, strlen(s->code_data + using_code_len)); marc_iconv_reset(mt, wr); - wrbuf_printf(wr, "code_data, using_code_len); + wrbuf_printf(wr, "code_data, using_code_len); wrbuf_puts(wr, ">\n"); } wrbuf_printf(wr, " iconv_cd, n->u.datafield.tag, - strlen(n->u.datafield.tag)); - wrbuf_printf(wr, ">\n", datafield_name[turbo]); + strlen(n->u.datafield.tag)); + wrbuf_printf(wr, ">\n"); break; case YAZ_MARC_CONTROLFIELD: - wrbuf_printf(wr, " <%s", controlfield_name[turbo]); - if (!turbo) { + wrbuf_printf(wr, " <%s", controlfield_name[turbo]); + if (!turbo) + { wrbuf_printf(wr, " tag=\""); - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.controlfield.tag, - strlen(n->u.controlfield.tag)); - wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); - } - else { - //TODO convert special - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.controlfield.tag, + wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.controlfield.tag, strlen(n->u.controlfield.tag)); - wrbuf_iconv_puts(wr, mt->iconv_cd, ">"); - } - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, - n->u.controlfield.data, - strlen(n->u.controlfield.data)); - marc_iconv_reset(mt, wr); - wrbuf_printf(wr, "iconv_cd, n->u.controlfield.tag, - strlen(n->u.controlfield.tag)); - wrbuf_puts(wr, ">\n"); - break; - case YAZ_MARC_COMMENT: - wrbuf_printf(wr, "\n"); - break; - case YAZ_MARC_LEADER: - wrbuf_printf(wr, " <%s>", leader_name[turbo]); - wrbuf_iconv_write_cdata(wr, - 0 , /* no charset conversion for leader */ - n->u.leader, strlen(n->u.leader)); - wrbuf_printf(wr, "\n", leader_name[turbo]); - } - } - wrbuf_printf(wr, "\n", record_name[turbo]); - return 0; -} - -static int yaz_marc_write_marcxml_ns2(yaz_marc_t mt, WRBUF wr, - const char *ns, - const char *format, - const char *type) -{ - struct yaz_marc_node *n; - int identifier_length; - const char *leader = 0; - - for (n = mt->nodes; n; n = n->next) - if (n->which == YAZ_MARC_LEADER) - { - leader = n->u.leader; - break; - } - - if (!leader) - return -1; - if (!atoi_n_check(leader+11, 1, &identifier_length)) - return -1; - - if (mt->enable_collection != no_collection) - { - if (mt->enable_collection == collection_first) - wrbuf_printf(wr, "\n", ns); - mt->enable_collection = collection_second; - wrbuf_printf(wr, "\n"); - for (n = mt->nodes; n; n = n->next) - { - struct yaz_marc_subfield *s; - - switch(n->which) - { - case YAZ_MARC_DATAFIELD: - wrbuf_printf(wr, " iconv_cd, n->u.datafield.tag, - strlen(n->u.datafield.tag)); - wrbuf_printf(wr, "\""); - if (n->u.datafield.indicator) - { - int i; - for (i = 0; n->u.datafield.indicator[i]; i++) - { - wrbuf_printf(wr, " ind%d=\"", i+1); - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, - n->u.datafield.indicator+i, 1); - wrbuf_iconv_puts(wr, mt->iconv_cd, "\""); - } + wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); } - wrbuf_printf(wr, ">\n"); - for (s = n->u.datafield.subfields; s; s = s->next) + else { - size_t using_code_len = get_subfield_len(mt, s->code_data, - identifier_length); - wrbuf_iconv_puts(wr, mt->iconv_cd, " iconv_cd, - s->code_data, using_code_len); - wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); - wrbuf_iconv_write_cdata(wr, mt->iconv_cd, - s->code_data + using_code_len, - strlen(s->code_data + using_code_len)); - marc_iconv_reset(mt, wr); - wrbuf_iconv_puts(wr, mt->iconv_cd, ""); - wrbuf_puts(wr, "\n"); + /* TODO convert special */ + wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.controlfield.tag, + strlen(n->u.controlfield.tag)); + wrbuf_iconv_puts(wr, mt->iconv_cd, ">"); } - wrbuf_printf(wr, " \n"); - break; - case YAZ_MARC_CONTROLFIELD: - wrbuf_printf(wr, " iconv_cd, n->u.controlfield.tag, - strlen(n->u.controlfield.tag)); - wrbuf_iconv_puts(wr, mt->iconv_cd, "\">"); wrbuf_iconv_write_cdata(wr, mt->iconv_cd, n->u.controlfield.data, strlen(n->u.controlfield.data)); - marc_iconv_reset(mt, wr); - wrbuf_iconv_puts(wr, mt->iconv_cd, ""); - wrbuf_puts(wr, "\n"); + wrbuf_printf(wr, "iconv_cd, n->u.controlfield.tag, + strlen(n->u.controlfield.tag)); + wrbuf_puts(wr, ">\n"); break; case YAZ_MARC_COMMENT: wrbuf_printf(wr, "\n"); break; case YAZ_MARC_LEADER: - wrbuf_printf(wr, " "); - wrbuf_iconv_write_cdata(wr, - 0 /* no charset conversion for leader */, + wrbuf_printf(wr, " <%s>", leader_name[turbo]); + wrbuf_iconv_write_cdata(wr, + 0 , /* no charset conversion for leader */ n->u.leader, strlen(n->u.leader)); - wrbuf_printf(wr, "\n"); + wrbuf_printf(wr, "\n", leader_name[turbo]); } } - wrbuf_puts(wr, "\n"); + wrbuf_printf(wr, "\n", record_name[turbo]); return 0; } - static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, const char *ns, const char *format, - const char *type) + const char *type, + int turbo) { if (mt->write_using_libxml2) { @@ -871,10 +783,10 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, int ret; xmlNode *root_ptr; - 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 (!turbo) + ret = yaz_marc_write_xml(mt, &root_ptr, ns, format, type); + else + ret = yaz_marc_write_xml_turbo_xml(mt, &root_ptr, ns, format, type); if (ret == 0) { xmlChar *buf_out; @@ -895,7 +807,7 @@ static int yaz_marc_write_marcxml_ns(yaz_marc_t mt, WRBUF wr, #endif } else - return yaz_marc_write_marcxml_ns1(mt, wr, ns, format, type); + return yaz_marc_write_marcxml_wrbuf(mt, wr, ns, format, type, turbo); } int yaz_marc_write_marcxml(yaz_marc_t mt, WRBUF wr) @@ -904,11 +816,19 @@ 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"); - 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); + return yaz_marc_write_marcxml_ns(mt, wr, + "http://www.loc.gov/MARC21/slim", + 0, 0, 0); +} + +int yaz_marc_write_turbomarc(yaz_marc_t mt, WRBUF wr) +{ + /* set leader 09 to 'a' for UNICODE */ + /* 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.indexdata.com/turbomarc", 0, 0, 1); } int yaz_marc_write_marcxchange(yaz_marc_t mt, WRBUF wr, @@ -917,28 +837,27 @@ int yaz_marc_write_marcxchange(yaz_marc_t mt, WRBUF wr, { return yaz_marc_write_marcxml_ns(mt, wr, "info:lc/xmlns/marcxchange-v1", - 0, 0); + 0, 0, 0); } #if YAZ_HAVE_XML2 -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) +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 { - //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); - } + WRBUF subfield_name = wrbuf_alloc(); + + /* 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) { int i; @@ -949,13 +868,13 @@ void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, xmlNod ind_val[0] = n->u.datafield.indicator[i]; ind_val[1] = '\0'; - sprintf(ind_str, "%s%d", indicator_name[turbo], i+1); - xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val); + sprintf(ind_str, "%s%d", indicator_name[1], i+1); + xmlNewProp(ptr, BAD_CAST ind_str, BAD_CAST ind_val); } } - WRBUF subfield_name = wrbuf_alloc(); for (s = n->u.datafield.subfields; s; s = s->next) { + int not_written; xmlNode *ptr_subfield; size_t using_code_len = get_subfield_len(mt, s->code_data, identifier_length); @@ -963,31 +882,27 @@ void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, xmlNod wrbuf_iconv_puts(wr_cdata, mt->iconv_cd, s->code_data + using_code_len); marc_iconv_reset(mt, 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"); - element_name_encode(mt, subfield_name, s->code_data, using_code_len); - ptr_subfield = xmlNewTextChild(ptr, ns_record, - BAD_CAST wrbuf_cstr(subfield_name), - BAD_CAST wrbuf_cstr(wr_cdata)); + wrbuf_rewind(subfield_name); + wrbuf_puts(subfield_name, "s"); + not_written = element_name_append_attribute_value(mt, subfield_name, 0, s->code_data, using_code_len) != 0; + ptr_subfield = xmlNewTextChild(ptr, ns_record, + BAD_CAST wrbuf_cstr(subfield_name), + BAD_CAST wrbuf_cstr(wr_cdata)); + if (not_written) + { + /* Generate code attribute value and add */ + 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)); } } - wrbuf_destroy(subfield_name); + wrbuf_destroy(subfield_name); } -int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, - const char *ns, - const char *format, - const char *type) +static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, + const char *ns, + const char *format, + const char *type) { struct yaz_marc_node *n; int identifier_length; @@ -995,7 +910,7 @@ int yaz_marc_write_turbo_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) { @@ -1022,49 +937,34 @@ int yaz_marc_write_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, xmlNewProp(record_ptr, BAD_CAST "type", BAD_CAST type); for (n = mt->nodes; n; n = n->next) { - struct yaz_marc_subfield *s; xmlNode *ptr; + char field[10]; + field[0] = 'c'; + field[4] = '\0'; + switch(n->which) { case YAZ_MARC_DATAFIELD: - add_marc_datafield_turbo_xml(mt, n, record_ptr, ns_record, wr_cdata, identifier_length); + 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); - 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)); - } - + strncpy(field + 1, n->u.controlfield.tag, 3); + 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: - { - char *field = "leader"; - if (turbo) - field = "l"; - xmlNewTextChild(record_ptr, ns_record, BAD_CAST field, - BAD_CAST n->u.leader); - } + xmlNewTextChild(record_ptr, ns_record, BAD_CAST "l", + BAD_CAST n->u.leader); break; } } @@ -1178,9 +1078,6 @@ int yaz_marc_write_xml(yaz_marc_t mt, xmlNode **root_ptr, return 0; } - - - #endif int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) @@ -1291,8 +1188,7 @@ int yaz_marc_write_iso2709(yaz_marc_t mt, WRBUF wr) switch(n->which) { case YAZ_MARC_DATAFIELD: - wrbuf_printf(wr, "%.*s", indicator_length, - n->u.datafield.indicator); + wrbuf_write(wr, n->u.datafield.indicator, indicator_length); for (s = n->u.datafield.subfields; s; s = s->next) { wrbuf_putc(wr, ISO2709_IDFS); @@ -1342,45 +1238,11 @@ int yaz_marc_decode_buf (yaz_marc_t mt, const char *buf, int bsize, return r; } -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) - return mt->input_format; - return -1; -} - - -void yaz_marc_set_write_format(yaz_marc_t mt, int format) -{ - if (mt) { - mt->output_format = format; - } -} - -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); + mt->output_format = xmlmode; } - - void yaz_marc_debug(yaz_marc_t mt, int level) { if (mt) @@ -1474,8 +1336,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, "turbomarc")) + mode = YAZ_MARC_TURBOMARC; if (!strcmp(arg, "marcxchange")) mode = YAZ_MARC_XCHANGE; if (!strcmp(arg, "line")) @@ -1488,12 +1350,6 @@ 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