projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18f2ca9
)
normalize_record: simple rename
author
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 24 Apr 2014 09:01:10 +0000
(11:01 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Thu, 24 Apr 2014 09:01:10 +0000
(11:01 +0200)
src/normalize_record.c
patch
|
blob
|
history
diff --git
a/src/normalize_record.c
b/src/normalize_record.c
index
373cf6c
..
036c96e
100644
(file)
--- a/
src/normalize_record.c
+++ b/
src/normalize_record.c
@@
-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;
};
@@
-69,12
+69,12
@@
normalize_record_t normalize_record_create(struct conf_service *service,
{
*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;
}
@@
-92,14
+92,14
@@
normalize_record_t normalize_record_create(struct conf_service *service,
*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)
;
else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl"))
{
(*m)->stylesheet2 = service_xslt_get(service, stylesheets[i]);
if ((*m)->stylesheet2)
;
else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl"))
{
- if (!((*m)->stylesheet =
+ if (!((*m)->stylesheet1 =
xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s",
xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s",
@@
-143,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);
}
@@
-160,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)