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
Allow result reuse again
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.c
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
785293e
..
838d322
100644
(file)
--- a/
src/pazpar2_config.c
+++ b/
src/pazpar2_config.c
@@
-56,7
+56,6
@@
struct conf_config
WRBUF confdir;
char *path;
iochan_man_t iochan_man;
WRBUF confdir;
char *path;
iochan_man_t iochan_man;
- database_hosts_t database_hosts;
};
struct service_xslt
};
struct service_xslt
@@
-872,7
+871,6
@@
static struct conf_server *server_create(struct conf_config *config,
server->charsets = 0;
server->http_server = 0;
server->iochan_man = 0;
server->charsets = 0;
server->http_server = 0;
server->iochan_man = 0;
- server->database_hosts = config->database_hosts;
server->settings_fname = 0;
if (server_id)
server->settings_fname = 0;
if (server_id)
@@
-1276,7
+1274,7
@@
static int parse_config(struct conf_config *config, xmlNode *root)
return 0;
}
return 0;
}
-struct conf_config *config_create(const char *fname, int verbose)
+struct conf_config *config_create(const char *fname)
{
xmlDoc *doc = xmlReadFile(fname,
NULL,
{
xmlDoc *doc = xmlReadFile(fname,
NULL,
@@
-1310,7
+1308,6
@@
struct conf_config *config_create(const char *fname, int verbose)
config->path = nmem_strdup(nmem, ".");
config->no_threads = 0;
config->iochan_man = 0;
config->path = nmem_strdup(nmem, ".");
config->no_threads = 0;
config->iochan_man = 0;
- config->database_hosts = database_hosts_create();
config->confdir = wrbuf_alloc();
if ((p = strrchr(fname,
config->confdir = wrbuf_alloc();
if ((p = strrchr(fname,
@@
-1330,16
+1327,13
@@
struct conf_config *config_create(const char *fname, int verbose)
r = yaz_xml_include_simple(n, wrbuf_cstr(config->confdir));
if (r == 0) /* OK */
{
r = yaz_xml_include_simple(n, wrbuf_cstr(config->confdir));
if (r == 0) /* OK */
{
- if (verbose)
- {
- yaz_log(YLOG_LOG, "Configuration %s after include processing",
- fname);
+ yaz_log(YLOG_LOG, "Configuration %s after include processing",
+ fname);
#if LIBXML_VERSION >= 20600
#if LIBXML_VERSION >= 20600
- xmlDocFormatDump(yaz_log_file(), doc, 0);
+ xmlDocFormatDump(yaz_log_file(), doc, 0);
#else
#else
- xmlDocDump(yaz_log_file(), doc);
+ xmlDocDump(yaz_log_file(), doc);
#endif
#endif
- }
r = parse_config(config, n);
}
xmlFreeDoc(doc);
r = parse_config(config, n);
}
xmlFreeDoc(doc);
@@
-1376,7
+1370,6
@@
void config_destroy(struct conf_config *config)
struct conf_server *s_next = server->next;
server_destroy(server);
server = s_next;
struct conf_server *s_next = server->next;
server_destroy(server);
server = s_next;
- database_hosts_destroy(&config->database_hosts);
}
wrbuf_destroy(config->confdir);
nmem_destroy(config->nmem);
}
wrbuf_destroy(config->confdir);
nmem_destroy(config->nmem);