/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
struct normalize_step {
struct normalize_step *next;
- xsltStylesheet *stylesheet; /* created by normalize_record */
+ xsltStylesheet *stylesheet1; /* created by normalize_record */
xsltStylesheet *stylesheet2; /* external stylesheet (service) */
struct marcmap *marcmap;
};
if (!xsp_doc)
no_errors++;
+ else
{
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
- (*m)->stylesheet = NULL;
+ (*m)->stylesheet1 = NULL;
(*m)->stylesheet2 = NULL;
-
-
- (*m)->stylesheet = xsltParseStylesheetDoc(xsp_doc);
- if (!(*m)->stylesheet)
+
+
+ (*m)->stylesheet1 = xsltParseStylesheetDoc(xsp_doc);
+ if (!(*m)->stylesheet1)
no_errors++;
m = &(*m)->next;
}
for (i = 0; i < num; i++)
{
- WRBUF fname = conf_get_fname(conf, stylesheets[i]);
-
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
- (*m)->stylesheet = NULL;
-
+ (*m)->stylesheet1 = NULL;
(*m)->stylesheet2 = service_xslt_get(service, stylesheets[i]);
if ((*m)->stylesheet2)
;
- else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl"))
- {
- if (!((*m)->stylesheet =
+ else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl"))
+ {
+ WRBUF fname = conf_get_fname(conf, stylesheets[i]);
+ if (!((*m)->stylesheet1 =
xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s",
stylesheets[i]);
no_errors++;
}
+ wrbuf_destroy(fname);
}
else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-5], ".mmap"))
{
+ WRBUF fname = conf_get_fname(conf, stylesheets[i]);
if (!((*m)->marcmap = marcmap_load(wrbuf_cstr(fname), nt->nmem)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load marcmap: %s",
stylesheets[i]);
no_errors++;
}
+ wrbuf_destroy(fname);
}
else
{
yaz_log(YLOG_FATAL, "Cannot handle stylesheet: %s", stylesheets[i]);
no_errors++;
}
-
- wrbuf_destroy(fname);
m = &(*m)->next;
}
}
struct normalize_step *m;
for (m = nt->steps; m; m = m->next)
{
- if (m->stylesheet)
- xsltFreeStylesheet(m->stylesheet);
+ if (m->stylesheet1)
+ xsltFreeStylesheet(m->stylesheet1);
}
nmem_destroy(nt->nmem);
}
{
xmlNodePtr root = 0;
xmlDoc *ndoc;
- if (m->stylesheet)
- ndoc = xsltApplyStylesheet(m->stylesheet, *doc, parms);
+ if (m->stylesheet1)
+ ndoc = xsltApplyStylesheet(m->stylesheet1, *doc, parms);
else if (m->stylesheet2)
ndoc = xsltApplyStylesheet(m->stylesheet2, *doc, parms);
else if (m->marcmap)
ndoc = 0;
xmlFreeDoc(*doc);
*doc = 0;
-
+
if (ndoc)
root = xmlDocGetRootElement(ndoc);
*doc = ndoc;
else
{
+ if (!ndoc)
+ yaz_log(YLOG_WARN, "XSLT produced no document");
+ else if (!root)
+ yaz_log(YLOG_WARN, "XSLT produced XML with no root node");
+ else if (!root->children)
+ yaz_log(YLOG_WARN, "XSLT produced XML with no root children nodes");
if (ndoc)
xmlFreeDoc(ndoc);
return -1;