projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test for stemming
[yaz-moved-to-github.git]
/
src
/
record_conv.c
diff --git
a/src/record_conv.c
b/src/record_conv.c
index
695f088
..
9da5a44
100644
(file)
--- a/
src/record_conv.c
+++ b/
src/record_conv.c
@@
-192,7
+192,9
@@
static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr)
wrbuf_printf(p->wr_error, " with path '%s'", p->path);
return -1;
}
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\"/>:"
if (!xsp)
{
wrbuf_printf(p->wr_error, "Element: <xslt stylesheet=\"%s\"/>:"
@@
-207,14
+209,15
@@
static int conv_xslt(yaz_record_conv_t p, const xmlNode *ptr)
"EXSLT not supported"
#endif
")");
"EXSLT not supported"
#endif
")");
+ xmlFreeDoc(xsp_doc);
return -1;
}
else
{
struct yaz_record_conv_rule *r =
add_rule(p, YAZ_RECORD_CONV_RULE_XSLT);
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;
}
}
return 0;
@@
-532,7
+535,7
@@
static int yaz_record_conv_record_rule(yaz_record_conv_t p,
xmlChar *out_buf = 0;
int out_len;
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);
xsltSaveResultToString(&out_buf, &out_len, res, xsp);
#else
xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);