/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 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
NMEM nmem;
};
-normalize_record_t normalize_record_create(struct conf_service *service,
+normalize_record_t normalize_record_create(struct conf_config *conf,
const char *spec)
{
NMEM nmem = nmem_create();
nmem_strsplit(nt->nmem, ",", spec, &stylesheets, &num);
for (i = 0; i < num; i++)
{
- WRBUF fname = conf_get_fname(service, stylesheets[i]);
+ WRBUF fname = conf_get_fname(conf, stylesheets[i]);
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
}
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;
- xmlDoc *new;
+ xmlDoc *ndoc;
if (m->stylesheet)
- {
- new = xsltApplyStylesheet(m->stylesheet, *doc, parms);
- }
+ ndoc = xsltApplyStylesheet(m->stylesheet, *doc, parms);
else if (m->marcmap)
+ ndoc = marcmap_apply(m->marcmap, *doc);
+ else
+ ndoc = 0;
+ xmlFreeDoc(*doc);
+ *doc = 0;
+
+ if (ndoc)
+ root = xmlDocGetRootElement(ndoc);
+
+ if (ndoc && root && root->children)
+ *doc = ndoc;
+ else
{
- new = marcmap_apply(m->marcmap, *doc);
- }
-
- root = xmlDocGetRootElement(new);
-
- if (!new || !root || !root->children)
- {
- if (new)
- xmlFreeDoc(new);
- xmlFreeDoc(*doc);
+ if (ndoc)
+ xmlFreeDoc(ndoc);
return -1;
}
- xmlFreeDoc(*doc);
- *doc = new;
}
}
return 0;