X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftst_record_conv.c;h=d1d1659778285c6c6904664c1e7eb922fb228ef7;hp=2b414c67dafb7cdc61bb8cb84aab61b63735f59e;hb=88d3bedf772316f87e1996f655ccf8d1e2589755;hpb=e70cbdfde382dd605d58fc112cc2458cfce37382 diff --git a/test/tst_record_conv.c b/test/tst_record_conv.c index 2b414c6..d1d1659 100644 --- a/test/tst_record_conv.c +++ b/test/tst_record_conv.c @@ -1,16 +1,19 @@ -/* - * Copyright (C) 2005-2006, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: tst_record_conv.c,v 1.2 2006-05-03 13:04:46 adam Exp $ - * */ #include #include #include #include +#include +#include + +#if HAVE_CONFIG_H +#include +#endif -#if HAVE_XML2 +#if YAZ_HAVE_XML2 #include #include @@ -46,6 +49,8 @@ yaz_record_conv_t conv_configure(const char *xmlstring, WRBUF w) } else { + + int r = yaz_record_conv_configure(p, ptr); if (r) @@ -70,60 +75,77 @@ int conv_configure_test(const char *xmlstring, const char *expect_error, if (!p) { - if (expect_error && !strcmp(wrbuf_buf(w), expect_error)) + if (expect_error && !strcmp(wrbuf_cstr(w), expect_error)) ret = 1; else { ret = 0; - printf("%.*s\n", wrbuf_len(w), wrbuf_buf(w)); + printf("%s\n", wrbuf_cstr(w)); } } else { if (expect_error) - { ret = 0; - yaz_record_conv_destroy(p); - } else - { - if (pt) - *pt = p; - else - yaz_record_conv_destroy(p); ret = 1; - } } - wrbuf_free(w, 1); + + if (pt) + *pt = p; + else + if (p) + yaz_record_conv_destroy(p); + + wrbuf_destroy(w); return ret; } -static void tst_configure() +static void tst_configure(void) { + + + YAZ_CHECK(conv_configure_test("", "Missing 'convert' element", 0)); - YAZ_CHECK(conv_configure_test("", 0, 0)); - YAZ_CHECK(conv_configure_test("", - "Bad element 'bad'." - "Expected marc, xslt, ..", 0)); - YAZ_CHECK(conv_configure_test("" + + + YAZ_CHECK(conv_configure_test("" + "", + "Element : expected or " + " element, got ", 0)); + +#if YAZ_HAVE_XSLT + YAZ_CHECK(conv_configure_test("" "" "" - "", - "Attribute 'inputformat' required", 0)); - YAZ_CHECK(conv_configure_test("" - "" + "", + "Element : attribute 'inputformat' " + "required", 0)); + YAZ_CHECK(conv_configure_test("" + "" + "", + "Element : attribute 'stylesheet' " + "expected", 0)); + YAZ_CHECK(conv_configure_test("" "" - "", + "" + "", 0, 0)); +#else + YAZ_CHECK(conv_configure_test("" + "" + "", + "xslt unsupported." + " YAZ compiled without XSLT support", 0)); +#endif } static int conv_convert_test(yaz_record_conv_t p, @@ -138,7 +160,8 @@ static int conv_convert_test(yaz_record_conv_t p, else { WRBUF output_record = wrbuf_alloc(); - int r = yaz_record_conv_record(p, input_record, output_record); + int r = yaz_record_conv_record(p, input_record, strlen(input_record), + output_record); if (r) { if (output_expect_record) @@ -156,24 +179,14 @@ static int conv_convert_test(yaz_record_conv_t p, { ret = 0; } - else if (strlen(output_expect_record) != wrbuf_len(output_record)) - { - int expect_len = strlen(output_expect_record); - ret = 0; - printf("output_record expect-len=%d got-len=%d\n", expect_len, - wrbuf_len(output_record)); - printf("got-output_record = %.*s\n", - wrbuf_len(output_record), wrbuf_buf(output_record)); - printf("output_expect_record = %s\n", - output_expect_record); - } - else if (memcmp(output_expect_record, wrbuf_buf(output_record), - strlen(output_expect_record))) + else if (strcmp(output_expect_record, wrbuf_cstr(output_record))) { ret = 0; - printf("got-output_record = %.*s\n", - wrbuf_len(output_record), wrbuf_buf(output_record)); - printf("output_expect_record = %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", + (long) strlen(output_expect_record), output_expect_record); } else @@ -181,12 +194,28 @@ static int conv_convert_test(yaz_record_conv_t p, ret = 1; } } - wrbuf_free(output_record, 1); + wrbuf_destroy(output_record); } return ret; } -static void tst_convert() +static int conv_convert_test_iter(yaz_record_conv_t p, + const char *input_record, + const char *output_expect_record, + int num_iter) +{ + int i; + int ret; + for (i = 0; i < num_iter; i++) + { + ret = conv_convert_test(p, input_record, output_expect_record); + if (!ret) + break; + } + return ret; +} + +static void tst_convert1(void) { yaz_record_conv_t p = 0; const char *marcxml_rec = @@ -204,30 +233,32 @@ static void tst_convert() "\x1E\x20\x20\x20\x31\x31\x32\x32\x34\x34\x36\x36\x20\x1E\x20\x20" "\x1F\x61\x20\x20\x20\x31\x31\x32\x32\x34\x34\x36\x36\x20\x1E\x1D"; - YAZ_CHECK(conv_configure_test("" + YAZ_CHECK(conv_configure_test("" "" - "", + "", 0, &p)); YAZ_CHECK(conv_convert_test(p, marcxml_rec, iso2709_rec)); + yaz_record_conv_destroy(p); - YAZ_CHECK(conv_configure_test("" + YAZ_CHECK(conv_configure_test("" "" - "", + "", 0, &p)); YAZ_CHECK(conv_convert_test(p, iso2709_rec, marcxml_rec)); + yaz_record_conv_destroy(p); - YAZ_CHECK(conv_configure_test("" + YAZ_CHECK(conv_configure_test("" "" "" "" - "", + "", 0, &p)); YAZ_CHECK(conv_convert_test(p, marcxml_rec, marcxml_rec)); + yaz_record_conv_destroy(p); - - YAZ_CHECK(conv_configure_test("" + YAZ_CHECK(conv_configure_test("" "" "" "" - "", + "", 0, &p)); YAZ_CHECK(conv_convert_test(p, marcxml_rec, marcxml_rec)); + yaz_record_conv_destroy(p); +} + +static void tst_convert2(void) +{ + yaz_record_conv_t p = 0; + const char *marcxml_rec = + "\n" + " 00080nam a22000498a 4500\n" + " 11224466 \n" + " \n" + " københavn\n" + " \n" + "\n"; + const char *iso2709_rec = + "\x30\x30\x30\x37\x37\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" + "\x30\x30\x30\x30\x30\x31\x30\x30\x30\x31\x34\x30\x30\x30\x31\x33" + "\x1E\x20\x20\x20\x31\x31\x32\x32\x34\x34\x36\x36\x20\x1E\x20\x20" + "\x1F\x61\x6b\xb2\x62\x65\x6e\x68\x61\x76\x6e\x1E\x1D"; + YAZ_CHECK(conv_configure_test("" + "" + "", + 0, &p)); + YAZ_CHECK(conv_convert_test_iter(p, marcxml_rec, iso2709_rec, 100)); + yaz_record_conv_destroy(p); } #endif @@ -272,9 +334,13 @@ static void tst_convert() int main(int argc, char **argv) { YAZ_CHECK_INIT(argc, argv); -#if HAVE_XML2 + libxml2_error_to_yazlog(0 /* disable log */, 0); +#if YAZ_HAVE_XML2 tst_configure(); - tst_convert(); +#endif +#if YAZ_HAVE_XSLT + tst_convert1(); + tst_convert2(); #endif YAZ_CHECK_TERM; } @@ -282,6 +348,7 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab