X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord_conv.c;h=695f08858d233a4896a6b409c2912cde92a9e8e7;hb=5ba7734cc97eef6688596180b7faf535ee249976;hp=41e98819df185cbced1961c3e02be7fb9bb6f7b5;hpb=77f27a99f17bdd5e6fc4d8a202ecc6da4ef95660;p=yaz-moved-to-github.git diff --git a/src/record_conv.c b/src/record_conv.c index 41e9881..695f088 100644 --- a/src/record_conv.c +++ b/src/record_conv.c @@ -304,6 +304,12 @@ 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, "turbomarc")) + { + output_format_mode = YAZ_MARC_TURBOMARC; + if (input_charset && !output_charset) + output_charset = "utf-8"; + } else if (!strcmp(output_format, "marc")) { output_format_mode = YAZ_MARC_ISO2709; @@ -473,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)); @@ -484,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"); }