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
Rename service_add_metadata to count_metadata
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.c
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
3b9d47a
..
1aef7b4
100644
(file)
--- a/
src/pazpar2_config.c
+++ b/
src/pazpar2_config.c
@@
-513,7
+513,7
@@
static int parse_metadata(struct conf_service *service, xmlNode *n,
}
}
-static void service_add_metadata(xmlNode *n, int *num_metadata, int *num_sortkeys)
+static void count_metadata(xmlNode *n, int *num_metadata, int *num_sortkeys)
{
xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
(*num_metadata)++;
{
xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
(*num_metadata)++;
@@
-549,11
+549,11
@@
static struct conf_service *service_create_static(struct conf_server *server,
{
if (m->type == XML_ELEMENT_NODE &&
!strcmp((const char *) m->name, "metadata"))
{
if (m->type == XML_ELEMENT_NODE &&
!strcmp((const char *) m->name, "metadata"))
- service_add_metadata(m, &num_metadata, &num_sortkeys);
+ count_metadata(m, &num_metadata, &num_sortkeys);
}
}
else // This is a metadata-element proper, count it right away.
}
}
else // This is a metadata-element proper, count it right away.
- service_add_metadata(n, &num_metadata, &num_sortkeys);
+ count_metadata(n, &num_metadata, &num_sortkeys);
}
service = service_init(server, num_metadata, num_sortkeys, service_id);
}
service = service_init(server, num_metadata, num_sortkeys, service_id);
@@
-1263,8
+1263,8
@@
struct conf_config *config_create(const char *fname, int verbose)
{
xmlDoc *doc = xmlReadFile(fname,
NULL,
{
xmlDoc *doc = xmlReadFile(fname,
NULL,
- XML_PARSE_XINCLUDE + XML_PARSE_NOBLANKS
- + XML_PARSE_NSCLEAN + XML_PARSE_NONET );
+ XML_PARSE_XINCLUDE
+ + XML_PARSE_NSCLEAN + XML_PARSE_NONET);
xmlNode *n;
const char *p;
int r;
xmlNode *n;
const char *p;
int r;