/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
wrbuf_printf(p->wr_error, " with path '%s'", p->path);
return -1;
}
- xsp = xsltParseStylesheetDoc(xsp_doc);
+ /* need to copy this before passing it to the processor. It will
+ be encapsulated in the xsp and destroyed by xsltFreeStylesheet */
+ xsp = xsltParseStylesheetDoc(xmlCopyDoc(xsp_doc, 1));
if (!xsp)
{
wrbuf_printf(p->wr_error, "Element: <xslt stylesheet=\"%s\"/>:"
"EXSLT not supported"
#endif
")");
+ xmlFreeDoc(xsp_doc);
return -1;
}
else
{
struct yaz_record_conv_rule *r =
add_rule(p, YAZ_RECORD_CONV_RULE_XSLT);
- r->u.xslt.xsp_doc = xmlCopyDoc(xsp_doc, 1);
- xsltFreeStylesheet(xsp); /* will free xsp_doc */
+ r->u.xslt.xsp_doc = xsp_doc;
+ xsltFreeStylesheet(xsp);
}
}
return 0;
if (input_charset && !output_charset)
output_charset = "utf-8";
}
+ else if (!strcmp(output_format, "turbomarc"))
+ {
+ output_format_mode = YAZ_MARC_TURBOMARC;
+ if (input_charset && !output_charset)
+ output_charset = "utf-8";
+ }
else if (!strcmp(output_format, "marc"))
{
output_format_mode = YAZ_MARC_ISO2709;
ret = -1;
}
else if (r->u.marc.input_format == YAZ_MARC_MARCXML ||
- r->u.marc.input_format == YAZ_MARC_TMARCXML)
+ r->u.marc.input_format == YAZ_MARC_TURBOMARC)
{
xmlDocPtr doc = xmlParseMemory(wrbuf_buf(record),
wrbuf_len(record));
}
else
{
- ret = yaz_marc_read_xml(mt, xmlDocGetRootElement(doc));
+ ret = yaz_marc_read_xml(mt, xmlDocGetRootElement(doc));
if (ret)
wrbuf_printf(p->wr_error, "yaz_marc_read_xml failed");
}
xmlChar *out_buf = 0;
int out_len;
-#if YAZ_HAVE_XSLTSAVERESULTTOSTRING
+#if HAVE_XSLTSAVERESULTTOSTRING
xsltSaveResultToString(&out_buf, &out_len, res, xsp);
#else
xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);