/*
- * Copyright (C) 2005-2006, Index Data ApS
+ * Copyright (C) 2005-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tst_record_conv.c,v 1.9 2006-07-06 10:17:55 adam Exp $
+ * $Id: tst_record_conv.c,v 1.16 2007-03-20 21:37:32 adam Exp $
*
*/
#include <yaz/record_conv.h>
}
else
{
+
+
int r = yaz_record_conv_configure(p, ptr);
if (r)
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
- {
ret = 1;
- }
}
+
if (pt)
*pt = p;
else
- yaz_record_conv_destroy(p);
+ if (p)
+ yaz_record_conv_destroy(p);
- wrbuf_free(w, 1);
+ wrbuf_destroy(w);
return ret;
}
-static void tst_configure()
+static void tst_configure(void)
{
+
+
+
YAZ_CHECK(conv_configure_test("<bad", "xmlParseMemory", 0));
- YAZ_CHECK(conv_configure_test("<bad/>", "Missing 'convert' element", 0));
- YAZ_CHECK(conv_configure_test("<convert/>", 0, 0));
- YAZ_CHECK(conv_configure_test("<convert><bad/></convert>",
- "Bad element 'bad'."
- "Expected marc, xslt, ..", 0));
+
+
+ YAZ_CHECK(conv_configure_test("<backend syntax='usmarc' name='F'>"
+ "<bad/></backend>",
+ "Element <backend>: expected <marc> or "
+ "<xslt> element, got <bad>", 0));
+
#if YAZ_HAVE_XSLT
- YAZ_CHECK(conv_configure_test("<convert>"
+ YAZ_CHECK(conv_configure_test("<backend syntax='usmarc' name='F'>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
" inputcharset=\"marc-8\""
" outputcharset=\"marc-8\""
"/>"
- "</convert>",
- "Attribute 'inputformat' required", 0));
- YAZ_CHECK(conv_configure_test("<convert>"
+ "</backend>",
+ "Element <marc>: attribute 'inputformat' "
+ "required", 0));
+ YAZ_CHECK(conv_configure_test("<backend syntax='usmarc' name='F'>"
"<xslt/>"
- "</convert>",
- "Missing attribute 'stylesheet'", 0));
- YAZ_CHECK(conv_configure_test("<convert>"
- "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
+ "</backend>",
+ "Element <xslt>: attribute 'stylesheet' "
+ "expected", 0));
+ YAZ_CHECK(conv_configure_test("<backend syntax='usmarc' name='F'>"
"<marc"
" inputcharset=\"utf-8\""
" outputcharset=\"marc-8\""
" inputformat=\"xml\""
" outputformat=\"marc\""
"/>"
- "</convert>",
+ "<xslt stylesheet=\"tst_record_conv.xsl\"/>"
+ "</backend>",
0, 0));
#else
- YAZ_CHECK(conv_configure_test("<convert>"
+ YAZ_CHECK(conv_configure_test("<backend syntax='usmarc' name='F'>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
- "</convert>",
+ "</backend>",
"xslt unsupported."
" YAZ compiled without XSLT support", 0));
-#endif
+#endif
}
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",
- output_expect_record);
+ printf("got-output_record len=%d: %s\n",
+ wrbuf_len(output_record),wrbuf_cstr(output_record));
+ printf("output_expect_record len=%d %s\n",
+ strlen(output_expect_record), output_expect_record);
}
else
{
ret = 1;
}
}
- wrbuf_free(output_record, 1);
+ wrbuf_destroy(output_record);
}
return ret;
}
-static void tst_convert()
+static void tst_convert1(void)
{
yaz_record_conv_t p = 0;
const char *marcxml_rec =
"\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("<convert>"
+ YAZ_CHECK(conv_configure_test("<backend>"
"<marc"
" inputcharset=\"utf-8\""
" outputcharset=\"marc-8\""
" inputformat=\"xml\""
" outputformat=\"marc\""
"/>"
- "</convert>",
+ "</backend>",
0, &p));
YAZ_CHECK(conv_convert_test(p, marcxml_rec, iso2709_rec));
yaz_record_conv_destroy(p);
- YAZ_CHECK(conv_configure_test("<convert>"
+ YAZ_CHECK(conv_configure_test("<backend>"
"<marc"
" outputcharset=\"utf-8\""
" inputcharset=\"marc-8\""
" outputformat=\"marcxml\""
" inputformat=\"marc\""
"/>"
- "</convert>",
+ "</backend>",
0, &p));
YAZ_CHECK(conv_convert_test(p, iso2709_rec, marcxml_rec));
yaz_record_conv_destroy(p);
- YAZ_CHECK(conv_configure_test("<convert>"
+ YAZ_CHECK(conv_configure_test("<backend>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
" outputformat=\"marcxml\""
" inputformat=\"marc\""
"/>"
- "</convert>",
+ "</backend>",
0, &p));
YAZ_CHECK(conv_convert_test(p, marcxml_rec, marcxml_rec));
yaz_record_conv_destroy(p);
- YAZ_CHECK(conv_configure_test("<convert>"
+ YAZ_CHECK(conv_configure_test("<backend>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<xslt stylesheet=\"tst_record_conv.xsl\"/>"
"<marc"
" outputformat=\"marcxml\""
" inputformat=\"marc\""
"/>"
- "</convert>",
+ "</backend>",
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 =
+ "<record xmlns=\"http://www.loc.gov/MARC21/slim\">\n"
+ " <leader>00080nam a22000498a 4500</leader>\n"
+ " <controlfield tag=\"001\"> 11224466 </controlfield>\n"
+ " <datafield tag=\"010\" ind1=\" \" ind2=\" \">\n"
+ " <subfield code=\"a\">københavn</subfield>\n"
+ " </datafield>\n"
+ "</record>\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("<backend>"
+ "<marc"
+ " inputcharset=\"utf-8\""
+ " outputcharset=\"marc-8\""
+ " inputformat=\"xml\""
+ " outputformat=\"marc\""
+ "/>"
+ "</backend>",
+ 0, &p));
+ YAZ_CHECK(conv_convert_test(p, marcxml_rec, iso2709_rec));
+ yaz_record_conv_destroy(p);
+}
+
#endif
int main(int argc, char **argv)
#if YAZ_HAVE_XML2
tst_configure();
#endif
-#if YAZ_HAVE_XSLT
- tst_convert();
+#if YAZ_HAVE_XSLT
+ tst_convert1();
+ tst_convert2();
#endif
YAZ_CHECK_TERM;
}