X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_record_conv.c;h=35c652767c4b4f8074cecc66d935497325995af0;hp=dff7f688f75e11255ae20bf1e48e799601dfab77;hb=a2d04f72d33de6b0e92900d38ebedeeecb3fc336;hpb=3107ce3a34993d2f784387f227a50343fff83bbc diff --git a/test/test_record_conv.c b/test/test_record_conv.c index dff7f68..35c6527 100644 --- a/test/test_record_conv.c +++ b/test/test_record_conv.c @@ -1,17 +1,17 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include #include #include -#if HAVE_CONFIG_H -#include -#endif - #if YAZ_HAVE_XML2 #include @@ -51,7 +51,7 @@ yaz_record_conv_t conv_configure(const char *xmlstring, WRBUF w) int r = yaz_record_conv_configure(p, ptr); - + if (r) { wrbuf_puts(w, yaz_record_conv_get_error(p)); @@ -61,7 +61,7 @@ yaz_record_conv_t conv_configure(const char *xmlstring, WRBUF w) } xmlFreeDoc(doc); return p; - } + } } int conv_configure_test(const char *xmlstring, const char *expect_error, @@ -144,7 +144,7 @@ static void tst_configure(void) "", "xslt unsupported." " YAZ compiled without XSLT support", 0)); -#endif +#endif } static int conv_convert_test(yaz_record_conv_t p, @@ -181,7 +181,7 @@ static int conv_convert_test(yaz_record_conv_t p, else if (strcmp(output_expect_record, wrbuf_cstr(output_record))) { ret = 0; - printf("got-output_record len=%ld: %s\n", + printf("got-output_record len=%ld: %s\n", (long) wrbuf_len(output_record), wrbuf_cstr(output_record)); printf("output_expect_record len=%ld %s\n", @@ -225,6 +225,14 @@ static void tst_convert1(void) " 11224466 \n" " \n" "\n"; + const char *tmarcxml_rec = + "\n" + " 00080nam a22000498a 4500\n" + " 11224466 \n" + " \n" + " 11224466 \n" + " \n" + "\n"; const char *iso2709_rec = "\x30\x30\x30\x38\x30\x6E\x61\x6D\x20\x61\x32\x32\x30\x30\x30\x34" "\x39\x38\x61\x20\x34\x35\x30\x30\x30\x30\x31\x30\x30\x31\x33\x30" @@ -242,6 +250,7 @@ static void tst_convert1(void) "", 0, &p)); YAZ_CHECK(conv_convert_test(p, marcxml_rec, iso2709_rec)); + YAZ_CHECK(conv_convert_test(p, tmarcxml_rec, iso2709_rec)); yaz_record_conv_destroy(p); YAZ_CHECK(conv_configure_test("" @@ -337,7 +346,7 @@ int main(int argc, char **argv) #if YAZ_HAVE_XML2 tst_configure(); #endif -#if YAZ_HAVE_XSLT +#if YAZ_HAVE_XSLT tst_convert1(); tst_convert2(); #endif