X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmarcdisp.c;h=50447bed9460ceb1dbab97752b536adafdd03f81;hp=10fa7b96cc5e2cb5a25d99b62125c8d7113df863;hb=887a9c6336d4731d898e185b5bd08cc6424114a8;hpb=2b80c10f9e398cb35212f147e9f792dc24e82bb1 diff --git a/src/marcdisp.c b/src/marcdisp.c index 10fa7b9..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 @@ -140,10 +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) { @@ -243,13 +244,17 @@ void yaz_marc_add_datafield(yaz_marc_t mt, const char *tag, mt->subfield_pp = &n->u.datafield.subfields; } -// Magic function: adds a attribute value to the element name if it is plain characters. -// 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. - -int element_name_append_attribute_value(yaz_marc_t mt, WRBUF buffer, const char *attribute_name, char *code_data, size_t code_len) +/** \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 + /* TODO Map special codes to something possible for XML ELEMENT names */ int encode = 0; int index = 0; @@ -261,7 +266,7 @@ int element_name_append_attribute_value(yaz_marc_t mt, WRBUF buffer, const char (code_data[index] >= 'A' && code_data[index] <= 'Z'))) encode = 1; } - // Add as attribute + /* Add as attribute */ if (encode && attribute_name) wrbuf_printf(buffer, " %s=\"", attribute_name); @@ -271,7 +276,7 @@ int element_name_append_attribute_value(yaz_marc_t mt, WRBUF buffer, const char success = -1; if (encode && attribute_name) - wrbuf_printf(buffer, "\""); // return error if we couldn't handle it. + wrbuf_printf(buffer, "\""); /* return error if we couldn't handle it.*/ return success; } @@ -298,7 +303,7 @@ void yaz_marc_add_datafield_xml2(yaz_marc_t mt, char *tag_value, char *indicator 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; } @@ -569,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: @@ -593,8 +598,8 @@ int yaz_marc_write_mode(yaz_marc_t mt, WRBUF wr) return yaz_marc_write_line(mt, wr); case YAZ_MARC_MARCXML: return yaz_marc_write_marcxml(mt, wr); - case YAZ_MARC_TMARCXML: - return yaz_marc_write_turbo_xml(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: @@ -716,7 +721,7 @@ static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr, wrbuf_puts(wr, ">\n"); } wrbuf_printf(wr, " iconv_cd, n->u.datafield.tag, strlen(n->u.datafield.tag)); @@ -733,7 +738,7 @@ static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr, } else { - //TODO convert special + /* 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, ">"); @@ -743,7 +748,7 @@ static int yaz_marc_write_marcxml_wrbuf(yaz_marc_t mt, WRBUF wr, strlen(n->u.controlfield.data)); marc_iconv_reset(mt, wr); wrbuf_printf(wr, "iconv_cd, n->u.controlfield.tag, strlen(n->u.controlfield.tag)); @@ -816,14 +821,14 @@ int yaz_marc_write_marcxml(yaz_marc_t mt, WRBUF wr) 0, 0, 0); } -int yaz_marc_write_turbo_xml(yaz_marc_t mt, WRBUF wr) +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/MARC21/turboxml", 0, 0, 1); + "http://www.indexdata.com/turbomarc", 0, 0, 1); } int yaz_marc_write_marcxchange(yaz_marc_t mt, WRBUF wr, @@ -846,7 +851,7 @@ void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, struct yaz_marc_subfield *s; WRBUF subfield_name = wrbuf_alloc(); - //TODO consider if safe + /* TODO consider if safe */ char field[10]; field[0] = 'd'; strncpy(field + 1, n->u.datafield.tag, 3); @@ -885,7 +890,7 @@ void add_marc_datafield_turbo_xml(yaz_marc_t mt, struct yaz_marc_node *n, BAD_CAST wrbuf_cstr(wr_cdata)); if (not_written) { - // Generate code attribute value and add + /* 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)); @@ -958,13 +963,9 @@ static int yaz_marc_write_xml_turbo_xml(yaz_marc_t mt, xmlNode **root_ptr, xmlAddChild(record_ptr, ptr); break; case YAZ_MARC_LEADER: - { - char *field = "leader"; - field = "l"; - xmlNewTextChild(record_ptr, ns_record, BAD_CAST field, + xmlNewTextChild(record_ptr, ns_record, BAD_CAST "l", BAD_CAST n->u.leader); - } - break; + break; } } wrbuf_destroy(wr_cdata); @@ -1187,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); @@ -1336,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"))