return 0;
}
-struct conf_config *config_create(const char *fname)
+struct conf_config *config_create(const char *fname, int verbose)
{
xmlDoc *doc = xmlParseFile(fname);
xmlNode *n;
r = process_config_includes(config, n);
if (r == 0) /* OK */
{
- xmlDocFormatDump(stdout, doc, 0);
+ if (verbose)
+ {
+ yaz_log(YLOG_LOG, "Configuration %s after include processing",
+ fname);
+ xmlDocFormatDump(yaz_log_file(), doc, 0);
+ }
r = parse_config(config, n);
}
xmlFreeDoc(doc);
}
}
-void config_read_settings(struct conf_config *config,
- const char *path_override)
+void config_read_settings(struct conf_config *config)
{
struct conf_service *s = config->servers->service;
for (;s ; s = s->next)
{
init_settings(s);
- if (path_override)
- settings_read(s, path_override);
- else if (s->settings)
+ if (s->settings)
settings_read(s, s->settings);
else if (config->servers->server_settings)
settings_read(s, config->servers->server_settings);