/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
#include <libxml/parser.h>
#include <libxml/tree.h>
+#include <libxml/xinclude.h>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
struct service_xslt *next;
};
-static void conf_metadata_assign(NMEM nmem,
- struct conf_metadata * metadata,
- const char *name,
- enum conf_metadata_type type,
- enum conf_metadata_merge merge,
- enum conf_setting_type setting,
- int brief,
- int termlist,
- const char *rank,
- int sortkey_offset,
- enum conf_metadata_mergekey mt,
- const char *facetrule,
- const char *limitmap)
+static char *xml_context(const xmlNode *ptr, char *res, size_t len)
{
- assert(nmem && metadata && name);
-
- metadata->name = nmem_strdup(nmem, name);
-
- metadata->type = type;
-
- // enforcing that type_year is always range_merge
- if (metadata->type == Metadata_type_year)
- metadata->merge = Metadata_merge_range;
- else
- metadata->merge = merge;
-
- metadata->setting = setting;
- metadata->brief = brief;
- metadata->termlist = termlist;
- metadata->rank = nmem_strdup_null(nmem, rank);
- metadata->sortkey_offset = sortkey_offset;
- metadata->mergekey = mt;
- metadata->facetrule = nmem_strdup_null(nmem, facetrule);
- metadata->limitmap = nmem_strdup_null(nmem, limitmap);
-}
+ xmlAttr *attr = ptr->properties;
+ size_t off = len - 1;
+ res[off] = '\0';
+ for (; attr; attr = attr->next)
+ {
+ size_t l = strlen((const char *) attr->name);
+ if (off <= l + 1)
+ break;
+ off = off - l;
+ memcpy(res + off, attr->name, l);
+ res[--off] = '@';
+ }
+ while (ptr && ptr->type == XML_ELEMENT_NODE)
+ {
+ size_t l = strlen((const char *) ptr->name);
+ if (off <= l + 1)
+ break;
-static void conf_sortkey_assign(NMEM nmem,
- struct conf_sortkey * sortkey,
- const char *name,
- enum conf_sortkey_type type)
-{
- assert(nmem && sortkey && name);
+ off = off - l;
+ memcpy(res + off, ptr->name, l);
+ res[--off] = '/';
- sortkey->name = nmem_strdup(nmem, name);
- sortkey->type = type;
+ ptr = ptr->parent;
+ }
+ return res + off;
}
struct conf_service *service_init(struct conf_server *server,
service->sortkeys
= nmem_malloc(nmem,
sizeof(struct conf_sortkey) * service->num_sortkeys);
-
-
+ service->xml_node = 0;
return service;
}
int sortkey_offset,
enum conf_metadata_mergekey mt,
const char *facetrule,
- const char *limitmap
+ const char *limitmap,
+ const char *limitcluster
)
{
struct conf_metadata * md = 0;
+ NMEM nmem = service->nmem;
- if (!service || !service->metadata || !service->num_metadata
+ if (!service->metadata || !service->num_metadata
|| field_id < 0 || !(field_id < service->num_metadata))
return 0;
md = service->metadata + field_id;
- conf_metadata_assign(service->nmem, md, name, type, merge, setting,
- brief, termlist, rank, sortkey_offset,
- mt, facetrule, limitmap);
+ assert(nmem && md && name);
+
+ md->name = nmem_strdup(nmem, name);
+
+ md->type = type;
+
+ // enforcing that type_year is always range_merge
+ if (md->type == Metadata_type_year)
+ md->merge = Metadata_merge_range;
+ else
+ md->merge = merge;
+
+ md->setting = setting;
+ md->brief = brief;
+ md->termlist = termlist;
+ md->rank = nmem_strdup_null(nmem, rank);
+ md->sortkey_offset = sortkey_offset;
+ md->mergekey = mt;
+ md->facetrule = nmem_strdup_null(nmem, facetrule);
+ md->limitmap = nmem_strdup_null(nmem, limitmap);
+ md->limitcluster = nmem_strdup_null(nmem, limitcluster);
return md;
}
-static struct conf_sortkey * conf_service_add_sortkey(
+static struct conf_sortkey *conf_service_add_sortkey(
struct conf_service *service,
int field_id,
const char *name,
- enum conf_sortkey_type type)
+ enum conf_metadata_type type)
{
- struct conf_sortkey * sk = 0;
+ struct conf_sortkey *sk = 0;
+ NMEM nmem = service->nmem;
- if (!service || !service->sortkeys || !service->num_sortkeys
+ if (!service->sortkeys || !service->num_sortkeys
|| field_id < 0 || !(field_id < service->num_sortkeys))
return 0;
- //sk = &((service->sortkeys)[field_id]);
sk = service->sortkeys + field_id;
- conf_sortkey_assign(service->nmem, sk, name, type);
+ assert(nmem && sk && name);
+
+ sk->name = nmem_strdup(nmem, name);
+ sk->type = type;
return sk;
}
void service_incref(struct conf_service *service)
{
- yaz_log(YLOG_LOG, "service_incref. p=%p cnt=%d", service,
- service->ref_count);
pazpar2_incref(&service->ref_count, service->mutex);
}
xmlChar *xml_setting = 0;
xmlChar *xml_mergekey = 0;
xmlChar *xml_limitmap = 0;
+ xmlChar *xml_limitcluster = 0;
xmlChar *xml_icu_chain = 0;
struct _xmlAttr *attr;
+
+ assert(service);
+
for (attr = n->properties; attr; attr = attr->next)
{
if (!xmlStrcmp(attr->name, BAD_CAST "name") &&
else if (!xmlStrcmp(attr->name, BAD_CAST "limitmap") &&
attr->children && attr->children->type == XML_TEXT_NODE)
xml_limitmap = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "limitcluster") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_limitcluster = attr->children->content;
else
{
yaz_log(YLOG_FATAL, "Unknown metadata attribute '%s'", attr->name);
type = Metadata_type_year;
else if (!strcmp((const char *) xml_type, "date"))
type = Metadata_type_date;
+ else if (!strcmp((const char *) xml_type, "float"))
+ type = Metadata_type_float;
else
{
yaz_log(YLOG_FATAL,
merge = Metadata_merge_range;
else if (!strcmp((const char *) xml_merge, "all"))
merge = Metadata_merge_all;
+ else if (!strcmp((const char *) xml_merge, "first"))
+ merge = Metadata_merge_first;
else
{
yaz_log(YLOG_FATAL,
else
{
yaz_log(YLOG_FATAL,
- "Unknown value for medadata/setting: %s", xml_setting);
+ "Unknown value for metadata/setting: %s", xml_setting);
return -1;
}
}
// add a sortkey if so specified
if (xml_sortkey && strcmp((const char *) xml_sortkey, "no"))
{
- enum conf_sortkey_type sk_type;
+ enum conf_metadata_type sk_type = type;
if (merge == Metadata_merge_no)
{
yaz_log(YLOG_FATAL,
"Can't specify sortkey on a non-merged field");
return -1;
}
+ if (!strcmp((const char *) xml_sortkey, "yes"))
+ ;
if (!strcmp((const char *) xml_sortkey, "numeric"))
- sk_type = Metadata_sortkey_numeric;
+ ;
else if (!strcmp((const char *) xml_sortkey, "skiparticle"))
- sk_type = Metadata_sortkey_skiparticle;
+ {
+ if (sk_type == Metadata_type_generic)
+ sk_type = Metadata_type_skiparticle;
+ else
+ {
+ yaz_log(YLOG_FATAL,
+ "skiparticle only supported for type=generic: %s",
+ xml_type);
+ return -1;
+ }
+ }
else
{
yaz_log(YLOG_FATAL,
(const char *) xml_rank, sortkey_offset,
mergekey_type,
(const char *) xml_icu_chain,
- (const char *) xml_limitmap);
+ (const char *) xml_limitmap,
+ (const char *) xml_limitcluster);
(*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"))
{
if (service_xslt_config(service, n))
return 0;
}
- else if (!strcmp((const char *) n->name, (const char *) "set"))
- {
- xmlChar *name= xmlGetProp(n, (xmlChar *) "name");
- xmlChar *value = xmlGetProp(n, (xmlChar *) "value");
- if (service->dictionary && name && value) {
- yaz_log(YLOG_DEBUG, "service set: %s=%s (Not implemented)", (char *) name, (char *) value);
- //service_aply_setting(service, name, value);
- }
- }
else if (!strcmp((const char *) n->name, "rank"))
{
char *rank_cluster = (char *) xmlGetProp(n, (xmlChar *) "cluster");
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
}
else
{
- yaz_log(YLOG_FATAL, "Bad element: %s", n->name);
+ char tmp[80];
+ yaz_log(YLOG_FATAL, "Bad element: %s . Context: %s", n->name,
+ xml_context(n, tmp, sizeof tmp));
return 0;
}
}
}
}
}
+
+ {
+ xmlBufferPtr buf = xmlBufferCreate();
+ xmlNodeDump(buf, node->doc, node, 0, 0);
+ service->xml_node =
+ nmem_strdupn(service->nmem, (const char *) buf->content, buf->use);
+ xmlBufferFree(buf);
+ }
return service;
}
struct conf_server *server = nmem_malloc(nmem, sizeof(struct conf_server));
xmlChar *server_id = xmlGetProp(node, (xmlChar *) "id");
- server->host = 0;
+ server->host = "@";
server->port = 0;
server->proxy_host = 0;
server->proxy_port = 0;
{
xmlChar *port = xmlGetProp(n, (xmlChar *) "port");
xmlChar *host = xmlGetProp(n, (xmlChar *) "host");
+
if (port)
- server->port = atoi((const char *) port);
+ server->port = nmem_strdup(nmem, (const char *) port);
if (host)
server->host = nmem_strdup(nmem, (const char *) host);
+
xmlFree(port);
xmlFree(host);
}
{
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;
return 0;
}
}
+ if (!server->port)
+ {
+ yaz_log(YLOG_FATAL, "No listening port given");
+ return 0;
+ }
if (server->service)
{
struct conf_service *s;
return s;
}
+static void info_service_metadata(struct conf_service *service, WRBUF w)
+{
+ int i;
+ struct conf_metadata *md;
+
+ if (service->num_metadata)
+ {
+ for (i = 0; i < service->num_metadata; i++)
+ {
+ md = &(service->metadata[i]);
+ wrbuf_puts(w, " <metadata");
+ if (md->name) {
+ wrbuf_puts(w, " name=\"");
+ wrbuf_xmlputs(w, md->name);
+ wrbuf_puts(w, "\"");
+ }
+ if (md->brief) {
+ wrbuf_puts(w, " brief=\"yes\"");
+ }
+ if (md->termlist) {
+ wrbuf_puts(w, " termlist=\"yes\"");
+ }
+ if (md->rank) {
+ wrbuf_puts(w, " rank=\"");
+ wrbuf_xmlputs(w, md->rank);
+ wrbuf_puts(w, "\"");
+ }
+ if (md->sortkey_offset > 0) {
+ wrbuf_puts(w, " sortkey=\"");
+ switch (service->sortkeys[md->sortkey_offset].type)
+ {
+ case Metadata_type_relevance:
+ wrbuf_puts(w, "relevance");
+ break;
+ case Metadata_type_skiparticle:
+ wrbuf_puts(w, "skiparticle");
+ break;
+ case Metadata_type_position:
+ wrbuf_puts(w, "position");
+ break;
+ default:
+ wrbuf_puts(w, "yes");
+ break;
+ }
+ wrbuf_puts(w, "\"");
+ }
+ switch (md->type)
+ {
+ case Metadata_type_generic:
+ case Metadata_type_skiparticle:
+ break;
+ case Metadata_type_year:
+ wrbuf_puts(w, " type=\"year\"");
+ break;
+ case Metadata_type_date:
+ wrbuf_puts(w, " type=\"date\"");
+ break;
+ case Metadata_type_float:
+ wrbuf_puts(w, " type=\"float\"");
+ break;
+ case Metadata_type_relevance:
+ case Metadata_type_position:
+ break;
+ }
+ switch (md->merge)
+ {
+ case Metadata_merge_no:
+ break;
+ case Metadata_merge_unique:
+ wrbuf_puts(w, " merge=\"unique\"");
+ break;
+ case Metadata_merge_longest:
+ wrbuf_puts(w, " merge=\"longest\"");
+ break;
+ case Metadata_merge_range:
+ wrbuf_puts(w, " merge=\"range\"");
+ break;
+ case Metadata_merge_all:
+ wrbuf_puts(w, " merge=\"all\"");
+ break;
+ case Metadata_merge_first:
+ wrbuf_puts(w, " merge=\"first\"");
+ break;
+ }
+ switch (md->mergekey)
+ {
+ case Metadata_mergekey_no:
+ break;
+ case Metadata_mergekey_optional:
+ wrbuf_puts(w, " mergekey=\"optional\"");
+ break;
+ case Metadata_mergekey_required:
+ wrbuf_puts(w, " mergekey=\"required\"");
+ break;
+ }
+ wrbuf_puts(w, " />\n");
+ }
+ }
+}
+
+static void info_service_databases(struct conf_service *service, WRBUF w)
+{
+ struct database *db;
+ struct setting *s;
+ int i;
+
+ if (service->databases)
+ {
+ wrbuf_puts(w, " <databases>\n");
+ for(db = service->databases; db; db = db->next)
+ {
+ wrbuf_puts(w, " <database");
+ if (db->id)
+ {
+ wrbuf_puts(w, " id=\"");
+ wrbuf_printf(w, "%s", db->id);
+ wrbuf_puts(w, "\"");
+ }
+ wrbuf_puts(w, ">\n");
+ for (i = 0; i < db->num_settings; i++)
+ {
+ s = db->settings[i];
+ while (s != NULL)
+ {
+ wrbuf_puts(w, " <setting");
+ wrbuf_puts(w, " 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");
+ }
+ wrbuf_puts(w, " </databases>\n");
+ }
+}
+
void info_services(struct conf_server *server, WRBUF w)
{
struct conf_service *s = server->service;
+ int i;
+ struct setting *S;
+
wrbuf_puts(w, " <services>\n");
for (; s; s = s->next)
{
wrbuf_xmlputs(w, s->id);
wrbuf_puts(w, "\"");
}
- wrbuf_puts(w, "/>");
+ wrbuf_puts(w, ">\n");
+ if (s->settings)
+ {
+ 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=\"");
+ wrbuf_xmlputs(w, S->name);
+ wrbuf_puts(w, "\"");
+ wrbuf_puts(w, " value=\"");
+ wrbuf_xmlputs(w, S->value);
+ wrbuf_puts(w, "\"");
+ 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");
}
struct conf_config *config_create(const char *fname, int verbose)
{
- xmlDoc *doc = xmlParseFile(fname);
+ xmlDoc *doc = xmlReadFile(fname,
+ NULL,
+ XML_PARSE_XINCLUDE
+ + XML_PARSE_NSCLEAN + XML_PARSE_NONET);
xmlNode *n;
const char *p;
int r;
return 0;
}
+ // Perform XInclude.
+ r = xmlXIncludeProcess(doc);
+ if (r == -1)
+ {
+ yaz_log(YLOG_FATAL, "XInclude processing failed");
+ return 0;
+ }
+
config->nmem = nmem;
config->servers = 0;
config->no_threads = 0;
s = s_next;
}
pp2_charset_fact_destroy(server->charsets);
- yaz_log(YLOG_LOG, "server_destroy server=%p", server);
http_server_destroy(server->http_server);
}
conf->iochan_man = iochan_man_create(conf->no_threads);
for (ser = conf->servers; ser; ser = ser->next)
{
- WRBUF w = wrbuf_alloc();
+ WRBUF w;
int r;
ser->iochan_man = conf->iochan_man;
if (listener_override)
{
- wrbuf_puts(w, listener_override);
- listener_override = 0; /* only first server is overriden */
- }
- else
- {
- if (ser->host)
- wrbuf_puts(w, ser->host);
- if (ser->port)
+ const char *cp = strrchr(listener_override, ':');
+ if (cp)
{
- if (wrbuf_len(w))
- wrbuf_puts(w, ":");
- wrbuf_printf(w, "%d", ser->port);
+ ser->host = nmem_strdupn(conf->nmem, listener_override,
+ cp - listener_override);
+ ser->port = nmem_strdup(conf->nmem, cp + 1);
}
+ else
+ {
+ ser->host = "@";
+ ser->port = nmem_strdup(conf->nmem, listener_override);
+ }
+ listener_override = 0; /* only first server is overriden */
}
- r = http_init(wrbuf_cstr(w), ser, record_fname);
- wrbuf_destroy(w);
+ r = http_init(ser, record_fname);
if (r)
return -1;