X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmarcdisp.c;h=25428060a53ea107b89aceb860d3b3eaa374fe28;hp=10fa7b96cc5e2cb5a25d99b62125c8d7113df863;hb=9f11f349958f122419856006d9295eb0ce41274d;hpb=2b80c10f9e398cb35212f147e9f792dc24e82bb1 diff --git a/src/marcdisp.c b/src/marcdisp.c index 10fa7b9..2542806 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -569,7 +569,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 +593,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: @@ -816,14 +816,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, @@ -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"))