X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Frecord_render.c;h=82da22c429ee008b97cdc96d23cc6bc359c9d567;hb=3ae80066499b6ec541c8f474654668f65f0f1c3c;hp=7ad8b73744f4c024daa2e7d3ea772de3828493ae;hpb=5242cb5a8634bfa38b9333ff7f903e718ac6e292;p=yaz-moved-to-github.git diff --git a/src/record_render.c b/src/record_render.c index 7ad8b73..82da22c 100644 --- a/src/record_render.c +++ b/src/record_render.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2012 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ /** @@ -167,7 +167,9 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len, charset); else if (r->which == Z_External_octet) { - if (yaz_oid_is_iso2709(oid)) + if (oid_oidcmp(oid, yaz_oid_recsyn_xml) + && oid_oidcmp(oid, yaz_oid_recsyn_application_xml) + && oid_oidcmp(oid, yaz_oid_recsyn_html)) { const char *ret_buf = return_marc_record( wrbuf, marctype, len, @@ -176,8 +178,8 @@ static const char *return_record_wrbuf(WRBUF wrbuf, int *len, charset); if (ret_buf) return ret_buf; - /* bad ISO2709. Return fail unless raw (ISO2709) is wanted */ - if (marctype != YAZ_MARC_ISO2709) + /* not ISO2709. Return fail unless raw (ISO2709) is wanted */ + if (yaz_oid_is_iso2709(oid) && marctype != YAZ_MARC_ISO2709) return 0; } return return_string_record(wrbuf, len,