struct conf_server *servers;
int no_threads;
+ int max_sockets;
WRBUF confdir;
+ char *path;
iochan_man_t iochan_man;
- database_hosts_t database_hosts;
};
struct service_xslt
enum conf_metadata_mergekey mt,
const char *facetrule,
const char *limitmap,
- const char *limitcluster
+ const char *limitcluster,
+ const char *icurule
)
{
struct conf_metadata * md = 0;
md->facetrule = nmem_strdup_null(nmem, facetrule);
md->limitmap = nmem_strdup_null(nmem, limitmap);
md->limitcluster = nmem_strdup_null(nmem, limitcluster);
+ md->icurule = nmem_strdup_null(nmem, icurule);
return md;
}
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
+ {
+ yaz_log(YLOG_WARN, "File not found: fname=%s path=%s base=%s", src,
+ config->path, wrbuf_cstr(config->confdir));
wrbuf_puts(w, src);
+ }
}
void service_destroy(struct conf_service *service)
xmlChar *xml_limitmap = 0;
xmlChar *xml_limitcluster = 0;
xmlChar *xml_icu_chain = 0;
+ xmlChar *xml_icurule = 0;
struct _xmlAttr *attr;
else if (!xmlStrcmp(attr->name, BAD_CAST "limitcluster") &&
attr->children && attr->children->type == XML_TEXT_NODE)
xml_limitcluster = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "icurule") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_icurule = attr->children->content;
else
{
yaz_log(YLOG_FATAL, "Unknown metadata attribute '%s'", attr->name);
mergekey_type,
(const char *) xml_icu_chain,
(const char *) xml_limitmap,
- (const char *) xml_limitcluster);
+ (const char *) xml_limitcluster,
+ (const char *) xml_icurule
+ );
(*md_node)++;
return 0;
}
+
+static void count_metadata(xmlNode *n, int *num_metadata, int *num_sortkeys)
+{
+ xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
+ (*num_metadata)++;
+
+ if (sortkey && strcmp((const char *) sortkey, "no"))
+ (*num_sortkeys)++;
+ xmlFree(sortkey);
+}
+
+
static struct conf_service *service_create_static(struct conf_server *server,
xmlNode *node,
const char *service_id)
if (n->type == XML_ELEMENT_NODE && !strcmp((const char *)
n->name, "metadata"))
{
- xmlChar *sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
- num_metadata++;
- if (sortkey && strcmp((const char *) sortkey, "no"))
- num_sortkeys++;
- xmlFree(sortkey);
+ if (n->children) // This is a <metadata> container, look at its contents.
+ {
+ xmlNode *m;
+ for (m = n->children; m; m = m->next)
+ {
+ if (m->type == XML_ELEMENT_NODE &&
+ !strcmp((const char *) m->name, "metadata"))
+ count_metadata(m, &num_metadata, &num_sortkeys);
+ }
+ }
+ else // This is a metadata-element proper, count it right away.
+ count_metadata(n, &num_metadata, &num_sortkeys);
}
service = service_init(server, num_metadata, num_sortkeys, service_id);
{
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;
}
else if (!strcmp((const char *) n->name, (const char *) "metadata"))
{
- if (parse_metadata(service, n, &md_node, &sk_node))
- return 0;
+ if (n->children) // This is a <metadata> container, look at its content.
+ {
+ xmlNode *m;
+ for (m = n->children; m; m = m->next)
+ if ((!strcmp((const char *) m->name, (const char *) "metadata")))
+ if (parse_metadata(service, m, &md_node, &sk_node))
+ return 0;
+ }
+ else // This is a metadata-element proper, count it right away.
+ if (parse_metadata(service, n, &md_node, &sk_node))
+ return 0;
}
else if (!strcmp((const char *) n->name, (const char *) "xslt"))
{
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;
if (!strcmp(rank_length, "linear"))
service->rank_length = 2;
else if (!strcmp(rank_length, "log"))
- service->rank_length = 1;
+ service->rank_length = 1;
else if (!strcmp(rank_length, "none"))
service->rank_length = 0;
else
server->charsets = 0;
server->http_server = 0;
server->iochan_man = 0;
- server->database_hosts = config->database_hosts;
server->settings_fname = 0;
if (server_id)
{
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;
case Metadata_type_position:
wrbuf_puts(w, "position");
break;
+ case Metadata_type_retrieval:
+ wrbuf_puts(w, "retrieval");
+ break;
default:
wrbuf_puts(w, "yes");
break;
case Metadata_type_float:
wrbuf_puts(w, " type=\"float\"");
break;
- case Metadata_type_relevance:
- case Metadata_type_position:
+ default:
break;
}
switch (md->merge)
static void info_service_databases(struct conf_service *service, WRBUF w)
{
- struct database *db;
- struct setting *s;
- int i;
if (service->databases)
{
+ struct database *db;
wrbuf_puts(w, " <databases>\n");
- for(db = service->databases; db; db = db->next)
+ for (db = service->databases; db; db = db->next)
{
+ int i;
wrbuf_puts(w, " <database");
if (db->id)
{
wrbuf_puts(w, ">\n");
for (i = 0; i < db->num_settings; i++)
{
- s = db->settings[i];
- while (s != NULL)
+ struct setting *s = db->settings[i];
+ for (; s; s = s->next)
{
- wrbuf_puts(w, " <setting");
- wrbuf_puts(w, " name=\"");
+ wrbuf_puts(w, " <setting name=\"");
wrbuf_xmlputs(w, s->name);
wrbuf_puts(w, "\"");
wrbuf_puts(w, " value=\"");
wrbuf_xmlputs(w, s->value);
wrbuf_puts(w, "\"");
wrbuf_puts(w, " />\n");
- s = s->next;
}
}
wrbuf_puts(w, " </database>\n");
{
struct conf_service *s = server->service;
int i;
- struct setting *S;
wrbuf_puts(w, " <services>\n");
for (; s; s = s->next)
wrbuf_puts(w, ">\n");
if (s->settings)
{
- for (i=0; i<s->settings->num_settings; i++)
+ for (i = 0; i < s->settings->num_settings; i++)
{
- S = s->settings->settings[i];
- while (S != NULL) {
- wrbuf_puts(w, " <setting");
- wrbuf_puts(w, " name=\"");
+ struct setting *S = s->settings->settings[i];
+ for (; S; S = S->next)
+ {
+ wrbuf_puts(w, " <setting name=\"");
wrbuf_xmlputs(w, S->name);
wrbuf_puts(w, "\"");
wrbuf_puts(w, " value=\"");
wrbuf_xmlputs(w, S->value);
wrbuf_puts(w, "\"");
- if (S->target) {
+ if (S->target)
+ {
wrbuf_puts(w, " target=\"");
wrbuf_xmlputs(w, S->target);
wrbuf_puts(w, "\"");
}
-
wrbuf_puts(w, " />\n");
-
- S = S->next;
}
}
}
info_service_metadata(s, w);
info_service_databases(s, w);
- wrbuf_puts(w, " </service>");
-
- wrbuf_puts(w, "\n");
+ wrbuf_puts(w, " </service>\n");
}
wrbuf_puts(w, " </services>\n");
}
xmlFree(number);
}
}
+ else if (!strcmp((const char *) n->name, "sockets"))
+ {
+ xmlChar *number = xmlGetProp(n, (xmlChar *) "max");
+ if (number)
+ {
+ config->max_sockets = atoi((const char *) 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");
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,
- 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;
config->nmem = nmem;
config->servers = 0;
+ config->path = nmem_strdup(nmem, ".");
config->no_threads = 0;
+ config->max_sockets = 0;
config->iochan_man = 0;
- config->database_hosts = database_hosts_create();
config->confdir = wrbuf_alloc();
if ((p = strrchr(fname,
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);
+#ifndef WIN32
+ yaz_log(YLOG_LOG, "Configuration %s after include processing",
+ fname);
#if LIBXML_VERSION >= 20600
- xmlDocFormatDump(yaz_log_file(), doc, 0);
+ xmlDocFormatDump(yaz_log_file(), doc, 0);
#else
- xmlDocDump(yaz_log_file(), doc);
+ xmlDocDump(yaz_log_file(), doc);
+#endif
#endif
- }
r = parse_config(config, n);
}
xmlFreeDoc(doc);
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);
{
struct conf_server *ser;
- conf->iochan_man = iochan_man_create(conf->no_threads);
+ conf->iochan_man = iochan_man_create(conf->no_threads, conf->max_sockets);
for (ser = conf->servers; ser; ser = ser->next)
{
WRBUF w;
projects / pazpar2-moved-to-github.git / blobdiff