projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into paz-927
[pazpar2-moved-to-github.git]
/
src
/
normalize_record.c
diff --git
a/src/normalize_record.c
b/src/normalize_record.c
index
2143d0d
..
70082fd
100644
(file)
--- a/
src/normalize_record.c
+++ b/
src/normalize_record.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* 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
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
@@
-36,7
+36,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
struct normalize_step {
struct normalize_step *next;
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;
};
xsltStylesheet *stylesheet2; /* external stylesheet (service) */
struct marcmap *marcmap;
};
@@
-47,12
+47,16
@@
struct normalize_record_s {
};
normalize_record_t normalize_record_create(struct conf_service *service,
};
normalize_record_t normalize_record_create(struct conf_service *service,
- const char *spec, int embed)
+ const char *spec)
{
NMEM nmem = nmem_create();
normalize_record_t nt = nmem_malloc(nmem, sizeof(*nt));
struct normalize_step **m = &nt->steps;
int no_errors = 0;
{
NMEM nmem = nmem_create();
normalize_record_t nt = nmem_malloc(nmem, sizeof(*nt));
struct normalize_step **m = &nt->steps;
int no_errors = 0;
+ int embed = 0;
+
+ if (*spec == '<')
+ embed = 1;
nt->nmem = nmem;
nt->nmem = nmem;
@@
-62,15
+66,16
@@
normalize_record_t normalize_record_create(struct conf_service *service,
if (!xsp_doc)
no_errors++;
if (!xsp_doc)
no_errors++;
+ else
{
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
{
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
- (*m)->stylesheet = NULL;
+ (*m)->stylesheet1 = NULL;
(*m)->stylesheet2 = 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;
}
no_errors++;
m = &(*m)->next;
}
@@
-84,41
+89,40
@@
normalize_record_t normalize_record_create(struct conf_service *service,
for (i = 0; i < num; i++)
{
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 = 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)
;
(*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++;
}
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"))
{
}
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++;
}
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++;
}
}
else
{
yaz_log(YLOG_FATAL, "Cannot handle stylesheet: %s", stylesheets[i]);
no_errors++;
}
-
- wrbuf_destroy(fname);
m = &(*m)->next;
}
}
m = &(*m)->next;
}
}
@@
-139,8
+143,8
@@
void normalize_record_destroy(normalize_record_t nt)
struct normalize_step *m;
for (m = nt->steps; m; 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);
}
}
nmem_destroy(nt->nmem);
}
@@
-156,8
+160,8
@@
int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
{
xmlNodePtr root = 0;
xmlDoc *ndoc;
{
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)
else if (m->stylesheet2)
ndoc = xsltApplyStylesheet(m->stylesheet2, *doc, parms);
else if (m->marcmap)
@@
-166,7
+170,7
@@
int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
ndoc = 0;
xmlFreeDoc(*doc);
*doc = 0;
ndoc = 0;
xmlFreeDoc(*doc);
*doc = 0;
-
+
if (ndoc)
root = xmlDocGetRootElement(ndoc);
if (ndoc)
root = xmlDocGetRootElement(ndoc);
@@
-174,6
+178,12
@@
int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
*doc = ndoc;
else
{
*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;
if (ndoc)
xmlFreeDoc(ndoc);
return -1;