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' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
normalize_record.c
diff --git
a/src/normalize_record.c
b/src/normalize_record.c
index
fa39da2
..
f75a0ee
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-2010 Index Data
+ Copyright (C) 2006-2011 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
@@
-29,14
+29,15
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "normalize_record.h"
#include "pazpar2_config.h"
#include "normalize_record.h"
#include "pazpar2_config.h"
-
+#include "service_xslt.h"
#include "marcmap.h"
#include <libxslt/xslt.h>
#include <libxslt/transform.h>
struct normalize_step {
struct normalize_step *next;
#include "marcmap.h"
#include <libxslt/xslt.h>
#include <libxslt/transform.h>
struct normalize_step {
struct normalize_step *next;
- xsltStylesheet *stylesheet;
+ xsltStylesheet *stylesheet; /* created by normalize_record */
+ xsltStylesheet *stylesheet2; /* external stylesheet (service) */
struct marcmap *marcmap;
};
struct marcmap *marcmap;
};
@@
-45,7
+46,7
@@
struct normalize_record_s {
NMEM nmem;
};
NMEM nmem;
};
-normalize_record_t normalize_record_create(struct conf_config *conf,
+normalize_record_t normalize_record_create(struct conf_service *service,
const char *spec)
{
NMEM nmem = nmem_create();
const char *spec)
{
NMEM nmem = nmem_create();
@@
-54,6
+55,7
@@
normalize_record_t normalize_record_create(struct conf_config *conf,
int i, num;
int no_errors = 0;
char **stylesheets;
int i, num;
int no_errors = 0;
char **stylesheets;
+ struct conf_config *conf = service->server->config;
nt->nmem = nmem;
nt->nmem = nmem;
@@
-65,9
+67,11
@@
normalize_record_t normalize_record_create(struct conf_config *conf,
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
(*m)->stylesheet = NULL;
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
(*m)->stylesheet = NULL;
-
- // XSLT
- 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 =
xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
{
if (!((*m)->stylesheet =
xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(fname))))
@@
-77,7
+81,6
@@
normalize_record_t normalize_record_create(struct conf_config *conf,
no_errors++;
}
}
no_errors++;
}
}
- // marcmap
else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-5], ".mmap"))
{
if (!((*m)->marcmap = marcmap_load(wrbuf_cstr(fname), nt->nmem)))
else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-5], ".mmap"))
{
if (!((*m)->marcmap = marcmap_load(wrbuf_cstr(fname), nt->nmem)))
@@
-121,34
+124,37
@@
void normalize_record_destroy(normalize_record_t nt)
}
int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
}
int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
- const char **parms)
+ const char **parms)
{
{
- struct normalize_step *m;
- if (nt) {
+ if (nt)
+ {
+ struct normalize_step *m;
for (m = nt->steps; m; m = m->next)
{
xmlNodePtr root = 0;
for (m = nt->steps; m; m = m->next)
{
xmlNodePtr root = 0;
- xmlDoc *new;
+ xmlDoc *ndoc;
if (m->stylesheet)
if (m->stylesheet)
- {
- new = xsltApplyStylesheet(m->stylesheet, *doc, parms);
- }
+ ndoc = xsltApplyStylesheet(m->stylesheet, *doc, parms);
+ else if (m->stylesheet2)
+ ndoc = xsltApplyStylesheet(m->stylesheet2, *doc, parms);
else if (m->marcmap)
else if (m->marcmap)
- {
- new = marcmap_apply(m->marcmap, *doc);
- }
-
- root = xmlDocGetRootElement(new);
-
+ ndoc = marcmap_apply(m->marcmap, *doc);
+ else
+ ndoc = 0;
xmlFreeDoc(*doc);
xmlFreeDoc(*doc);
- if (!new || !root || !root->children)
+ *doc = 0;
+
+ if (ndoc)
+ root = xmlDocGetRootElement(ndoc);
+
+ if (ndoc && root && root->children)
+ *doc = ndoc;
+ else
{
{
- if (new)
- xmlFreeDoc(new);
- *doc = 0;
+ if (ndoc)
+ xmlFreeDoc(ndoc);
return -1;
}
return -1;
}
- *doc = new;
}
}
return 0;
}
}
return 0;