X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord_conv.c;h=695f08858d233a4896a6b409c2912cde92a9e8e7;hb=ad4b64e5b3ab9ebc4b2e8184a3782b10962f7d3d;hp=b3ec821e6e743995e51488b04121ac607172d384;hpb=7c862e68f8fd3de440db2498bd5619f7f70ad43d;p=yaz-moved-to-github.git diff --git a/src/record_conv.c b/src/record_conv.c index b3ec821..695f088 100644 --- a/src/record_conv.c +++ b/src/record_conv.c @@ -304,9 +304,9 @@ static int conv_marc(yaz_record_conv_t p, const xmlNode *ptr) if (input_charset && !output_charset) output_charset = "utf-8"; } - else if (!strcmp(output_format, "tmarcxml")) + else if (!strcmp(output_format, "turbomarc")) { - output_format_mode = YAZ_MARC_TMARCXML; + output_format_mode = YAZ_MARC_TURBOMARC; if (input_charset && !output_charset) output_charset = "utf-8"; } @@ -479,7 +479,7 @@ static int yaz_record_conv_record_rule(yaz_record_conv_t p, ret = -1; } else if (r->u.marc.input_format == YAZ_MARC_MARCXML || - r->u.marc.input_format == YAZ_MARC_TMARCXML) + r->u.marc.input_format == YAZ_MARC_TURBOMARC) { xmlDocPtr doc = xmlParseMemory(wrbuf_buf(record), wrbuf_len(record)); @@ -490,7 +490,7 @@ static int yaz_record_conv_record_rule(yaz_record_conv_t p, } else { - ret = yaz_marc_read_xml(mt, xmlDocGetRootElement(doc)); + ret = yaz_marc_read_xml(mt, xmlDocGetRootElement(doc)); if (ret) wrbuf_printf(p->wr_error, "yaz_marc_read_xml failed"); }