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
Simplify the channel_list mutex locking. Fixed C90 warning.
[pazpar2-moved-to-github.git]
/
src
/
normalize_record.c
diff --git
a/src/normalize_record.c
b/src/normalize_record.c
index
322566e
..
fa39da2
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-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
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
@@
-45,7
+45,7
@@
struct normalize_record_s {
NMEM nmem;
};
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();
const char *spec)
{
NMEM nmem = nmem_create();
@@
-60,7
+60,7
@@
normalize_record_t normalize_record_create(struct conf_service *service,
nmem_strsplit(nt->nmem, ",", spec, &stylesheets, &num);
for (i = 0; i < num; i++)
{
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;
*m = nmem_malloc(nt->nmem, sizeof(**m));
(*m)->marcmap = NULL;
@@
-137,17
+137,17
@@
int normalize_record_transform(normalize_record_t nt, xmlDoc **doc,
{
new = marcmap_apply(m->marcmap, *doc);
}
{
new = marcmap_apply(m->marcmap, *doc);
}
-
+
root = xmlDocGetRootElement(new);
root = xmlDocGetRootElement(new);
+ xmlFreeDoc(*doc);
if (!new || !root || !root->children)
{
if (new)
xmlFreeDoc(new);
if (!new || !root || !root->children)
{
if (new)
xmlFreeDoc(new);
- xmlFreeDoc(*doc);
+ *doc = 0;
return -1;
}
return -1;
}
- xmlFreeDoc(*doc);
*doc = new;
}
}
*doc = new;
}
}