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
Use simpler var for timeout in event loop
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.c
diff --git
a/src/pazpar2_config.c
b/src/pazpar2_config.c
index
902c0e6
..
785293e
100644
(file)
--- a/
src/pazpar2_config.c
+++ b/
src/pazpar2_config.c
@@
-54,6
+54,7
@@
struct conf_config
int no_threads;
WRBUF confdir;
int no_threads;
WRBUF confdir;
+ char *path;
iochan_man_t iochan_man;
database_hosts_t database_hosts;
};
iochan_man_t iochan_man;
database_hosts_t database_hosts;
};
@@
-256,13
+257,20
@@
int conf_service_sortkey_field_id(struct conf_service *service,
static void conf_dir_path(struct conf_config *config, WRBUF w, const char *src)
{
static void conf_dir_path(struct conf_config *config, WRBUF w, const char *src)
{
- if (config->confdir && wrbuf_len(config->confdir) > 0 &&
- !yaz_is_abspath(src))
+ char full_path[1024];
+ if (yaz_filepath_resolve(src, config->path,
+ wrbuf_len(config->confdir) > 0 ?
+ wrbuf_cstr(config->confdir) : ".",
+ full_path))
{
{
- wrbuf_printf(w, "%s/%s", wrbuf_cstr(config->confdir), src);
+ wrbuf_puts(w, full_path);
}
else
}
else
+ {
+ yaz_log(YLOG_WARN, "File not found: fname=%s path=%s base=%s", src,
+ config->path, wrbuf_cstr(config->confdir));
wrbuf_puts(w, src);
wrbuf_puts(w, src);
+ }
}
void service_destroy(struct conf_service *service)
}
void service_destroy(struct conf_service *service)
@@
-513,7
+521,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
+557,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);
@@
-641,8
+649,8
@@
static struct conf_service *service_create_static(struct conf_server *server,
{
if (!service->charsets)
service->charsets = pp2_charset_fact_create();
{
if (!service->charsets)
service->charsets = pp2_charset_fact_create();
- if (pp2_charset_fact_define(service->charsets,
- n->children, (const char *) n->name))
+ if (pp2_charset_fact_define(service->charsets, n,
+ (const char *) n->name))
{
yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
{
yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
@@
-680,7
+688,7
@@
static struct conf_service *service_create_static(struct conf_server *server,
service->rank_cluster = 1;
else if (!strcmp(rank_cluster, "no"))
service->rank_cluster = 0;
service->rank_cluster = 1;
else if (!strcmp(rank_cluster, "no"))
service->rank_cluster = 0;
- else
+ else
{
yaz_log(YLOG_FATAL, "service: rank@cluster boolean");
return 0;
{
yaz_log(YLOG_FATAL, "service: rank@cluster boolean");
return 0;
@@
-944,8
+952,8
@@
static struct conf_server *server_create(struct conf_config *config,
{
if (!server->charsets)
server->charsets = pp2_charset_fact_create();
{
if (!server->charsets)
server->charsets = pp2_charset_fact_create();
- if (pp2_charset_fact_define(server->charsets,
- n->children, (const char *) n->name))
+ if (pp2_charset_fact_define(server->charsets, n,
+ (const char *) n->name))
{
yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
{
yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
@@
-1244,6
+1252,15
@@
static int parse_config(struct conf_config *config, xmlNode *root)
xmlFree(number);
}
}
xmlFree(number);
}
}
+ else if (!strcmp((const char *) n->name, "file"))
+ {
+ xmlChar *path = xmlGetProp(n, (xmlChar *) "path");
+ if (path)
+ {
+ config->path = nmem_strdup(config->nmem, (const char *) path);
+ xmlFree(path);
+ }
+ }
else if (!strcmp((const char *) n->name, "targetprofiles"))
{
yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service");
else if (!strcmp((const char *) n->name, "targetprofiles"))
{
yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service");
@@
-1290,6
+1307,7
@@
struct conf_config *config_create(const char *fname, int verbose)
config->nmem = nmem;
config->servers = 0;
config->nmem = nmem;
config->servers = 0;
+ config->path = nmem_strdup(nmem, ".");
config->no_threads = 0;
config->iochan_man = 0;
config->database_hosts = database_hosts_create();
config->no_threads = 0;
config->iochan_man = 0;
config->database_hosts = database_hosts_create();