/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 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 <libxslt/xslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
+#include <libxml/xinclude.h>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
#include <yaz/snprintf.h>
#include <yaz/tpath.h>
+#include <yaz/xml_include.h>
-#if HAVE_GLOB_H
-#define USE_POSIX_GLOB 1
-#else
-#define USE_POSIX_GLOB 0
-#endif
-
-
-#if USE_POSIX_GLOB
-#include <glob.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include "ppmutex.h"
+#include "incref.h"
#include "pazpar2_config.h"
+#include "service_xslt.h"
#include "settings.h"
#include "eventl.h"
#include "http.h"
{
NMEM nmem; /* for conf_config and servers memory */
struct conf_server *servers;
+
+ int no_threads;
+ int max_sockets;
WRBUF confdir;
+ char *path;
+ iochan_man_t iochan_man;
};
-
-static char *parse_settings(struct conf_config *config,
- NMEM nmem, xmlNode *node);
-
-static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
- xmlNode *node);
-
-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,
- int rank,
- int sortkey_offset,
- enum conf_metadata_mergekey mt)
+struct service_xslt
{
- assert(nmem && metadata && name);
-
- metadata->name = nmem_strdup(nmem, name);
+ char *id;
+ xsltStylesheetPtr xsp;
+ struct service_xslt *next;
+};
- metadata->type = type;
+static char *xml_context(const xmlNode *ptr, char *res, size_t len)
+{
+ xmlAttr *attr = ptr->properties;
+ size_t off = len - 1;
- // 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 = rank;
- metadata->sortkey_offset = sortkey_offset;
- metadata->mergekey = mt;
-}
+ 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;
+ off = off - l;
+ memcpy(res + off, ptr->name, l);
+ res[--off] = '/';
-static void conf_sortkey_assign(NMEM nmem,
- struct conf_sortkey * sortkey,
- const char *name,
- enum conf_sortkey_type type)
-{
- assert(nmem && sortkey && name);
-
- sortkey->name = nmem_strdup(nmem, name);
- sortkey->type = type;
+ ptr = ptr->parent;
+ }
+ return res + off;
}
-
-static struct conf_service *service_init(struct conf_server *server,
+struct conf_service *service_init(struct conf_server *server,
int num_metadata, int num_sortkeys,
const char *service_id)
{
struct conf_service * service = 0;
NMEM nmem = nmem_create();
+
service = nmem_malloc(nmem, sizeof(struct conf_service));
+ service->mutex = 0;
service->ref_count = 1;
service->nmem = nmem;
service->next = 0;
- service->settings = 0;
service->databases = 0;
- service->targetprofiles = 0;
+ service->xslt_list = 0;
+ service->ccl_bibset = 0;
service->server = server;
service->session_timeout = 60; /* default session timeout */
service->z3950_session_timeout = 180;
service->z3950_operation_timeout = 30;
+ service->rank_cluster = 1;
+ service->rank_debug = 0;
+ service->rank_follow = 0.0;
+ service->rank_lead = 0.0;
+ service->rank_length = 2;
- service->relevance_pct = 0;
- service->sort_pct = 0;
- service->mergekey_pct = 0;
+ service->charsets = 0;
service->id = service_id ? nmem_strdup(nmem, service_id) : 0;
+
+ // Setup a dictionary from server.
+ service->dictionary = 0;
+
+ service->settings = nmem_malloc(nmem, sizeof(*service->settings));
+ service->settings->num_settings = PZ_MAX_EOF;
+ service->settings->settings = nmem_malloc(nmem, sizeof(struct setting*) * service->settings->num_settings);
+ memset(service->settings->settings, 0, sizeof(struct setting*) * service->settings->num_settings);
+ // inherit_server_settings_values(service);
+
+ service->next = 0;
+
service->num_metadata = num_metadata;
+
service->metadata = 0;
if (service->num_metadata)
- service->metadata
- = nmem_malloc(nmem,
- sizeof(struct conf_metadata) * service->num_metadata);
+ service->metadata
+ = nmem_malloc(nmem,
+ sizeof(struct conf_metadata) * service->num_metadata);
service->num_sortkeys = num_sortkeys;
+
+ service->default_sort = nmem_strdup(nmem, "relevance");
service->sortkeys = 0;
if (service->num_sortkeys)
- service->sortkeys
- = nmem_malloc(nmem,
+ service->sortkeys
+ = nmem_malloc(nmem,
sizeof(struct conf_sortkey) * service->num_sortkeys);
- service->dictionary = 0;
- return service;
+ service->xml_node = 0;
+ return service;
}
static struct conf_metadata* conf_service_add_metadata(
enum conf_setting_type setting,
int brief,
int termlist,
- int rank,
+ const char *rank,
int sortkey_offset,
- enum conf_metadata_mergekey mt)
+ enum conf_metadata_mergekey mt,
+ const char *facetrule,
+ const char *limitmap,
+ const char *limitcluster,
+ const char *icurule
+ )
{
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);
+ 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);
+ md->icurule = nmem_strdup_null(nmem, icurule);
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
- || field_id < 0 || !(field_id < 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;
}
-
int conf_service_metadata_field_id(struct conf_service *service,
const char * name)
{
if (!service || !service->metadata || !service->num_metadata)
return -1;
- for(i = 0; i < service->num_metadata; i++) {
+ for (i = 0; i < service->num_metadata; i++)
if (!strcmp(name, (service->metadata[i]).name))
return i;
- }
-
return -1;
}
-
int conf_service_sortkey_field_id(struct conf_service *service,
const char * name)
{
if (!service || !service->sortkeys || !service->num_sortkeys)
return -1;
- for(i = 0; i < service->num_sortkeys; i++) {
+ for (i = 0; i < service->num_sortkeys; i++)
if (!strcmp(name, (service->sortkeys[i]).name))
return i;
- }
-
return -1;
}
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)
{
if (service)
{
- assert(service->ref_count > 0);
- service->ref_count--;
- if (service->ref_count == 0)
+ if (!pazpar2_decref(&service->ref_count, service->mutex))
{
- pp2_charset_destroy(service->relevance_pct);
- pp2_charset_destroy(service->sort_pct);
- pp2_charset_destroy(service->mergekey_pct);
+ service_xslt_destroy(service);
+ pp2_charset_fact_destroy(service->charsets);
+ ccl_qual_rm(&service->ccl_bibset);
+ yaz_mutex_destroy(&service->mutex);
nmem_destroy(service->nmem);
}
}
void service_incref(struct conf_service *service)
{
- service->ref_count++;
+ pazpar2_incref(&service->ref_count, service->mutex);
}
static int parse_metadata(struct conf_service *service, xmlNode *n,
int *md_node, int *sk_node)
{
- xmlChar *xml_name = xmlGetProp(n, (xmlChar *) "name");
- xmlChar *xml_brief = xmlGetProp(n, (xmlChar *) "brief");
- xmlChar *xml_sortkey = xmlGetProp(n, (xmlChar *) "sortkey");
- xmlChar *xml_merge = xmlGetProp(n, (xmlChar *) "merge");
- xmlChar *xml_type = xmlGetProp(n, (xmlChar *) "type");
- xmlChar *xml_termlist = xmlGetProp(n, (xmlChar *) "termlist");
- xmlChar *xml_rank = xmlGetProp(n, (xmlChar *) "rank");
- xmlChar *xml_setting = xmlGetProp(n, (xmlChar *) "setting");
- xmlChar *xml_mergekey = xmlGetProp(n, (xmlChar *) "mergekey");
-
enum conf_metadata_type type = Metadata_type_generic;
enum conf_metadata_merge merge = Metadata_merge_no;
enum conf_setting_type setting = Metadata_setting_no;
- enum conf_sortkey_type sk_type = Metadata_sortkey_relevance;
enum conf_metadata_mergekey mergekey_type = Metadata_mergekey_no;
int brief = 0;
int termlist = 0;
- int rank = 0;
int sortkey_offset = 0;
-
+ xmlChar *xml_name = 0;
+ xmlChar *xml_brief = 0;
+ xmlChar *xml_sortkey = 0;
+ xmlChar *xml_merge = 0;
+ xmlChar *xml_type = 0;
+ xmlChar *xml_termlist = 0;
+ xmlChar *xml_rank = 0;
+ xmlChar *xml_setting = 0;
+ xmlChar *xml_mergekey = 0;
+ xmlChar *xml_limitmap = 0;
+ xmlChar *xml_limitcluster = 0;
+ xmlChar *xml_icu_chain = 0;
+ xmlChar *xml_icurule = 0;
+
+ struct _xmlAttr *attr;
+
+ assert(service);
+
+ for (attr = n->properties; attr; attr = attr->next)
+ {
+ if (!xmlStrcmp(attr->name, BAD_CAST "name") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_name = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "brief") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_brief = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "sortkey") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_sortkey = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "merge") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_merge = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "type") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_type = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "termlist") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_termlist = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "rank") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_rank = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "setting") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_setting = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "mergekey") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_mergekey = attr->children->content;
+ else if (!xmlStrcmp(attr->name, BAD_CAST "facetrule") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_icu_chain = attr->children->content;
+ 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 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);
+ return -1;
+ }
+ }
+
// now do the parsing logic
if (!xml_name)
{
return -1;
}
}
- else
- brief = 0;
-
+
if (xml_termlist)
{
if (!strcmp((const char *) xml_termlist, "yes"))
return -1;
}
}
- else
- termlist = 0;
-
- if (xml_rank)
- rank = atoi((const char *) xml_rank);
- else
- rank = 0;
-
+
if (xml_type)
{
if (!strcmp((const char *) xml_type, "generic"))
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,
+ yaz_log(YLOG_FATAL,
"Unknown value for metadata/type: %s", xml_type);
return -1;
}
}
- else
- type = Metadata_type_generic;
-
+
if (xml_merge)
{
if (!strcmp((const char *) xml_merge, "no"))
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,
+ yaz_log(YLOG_FATAL,
"Unknown value for metadata/merge: %s", xml_merge);
return -1;
}
}
- else
- merge = Metadata_merge_no;
-
+
if (xml_setting)
{
if (!strcmp((const char *) xml_setting, "no"))
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_metadata_type sk_type = type;
if (merge == Metadata_merge_no)
{
- yaz_log(YLOG_FATAL,
+ 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,
- "Unknown sortkey in metadata element: %s",
+ "Unknown sortkey in metadata element: %s",
xml_sortkey);
return -1;
}
sortkey_offset = *sk_node;
-
+
conf_service_add_sortkey(service, *sk_node,
(const char *) xml_name, sk_type);
-
(*sk_node)++;
}
else
sortkey_offset = -1;
-
- if (xml_mergekey && strcmp((const char *) xml_mergekey, "no"))
+
+ if (xml_mergekey)
{
- mergekey_type = Metadata_mergekey_yes;
+ if (!strcmp((const char *) xml_mergekey, "required"))
+ mergekey_type = Metadata_mergekey_required;
+ else if (!strcmp((const char *) xml_mergekey, "optional"))
+ mergekey_type = Metadata_mergekey_optional;
+ else if (!strcmp((const char *) xml_mergekey, "no"))
+ mergekey_type = Metadata_mergekey_no;
+ else
+ {
+ yaz_log(YLOG_FATAL, "Unknown value for mergekey: %s", xml_mergekey);
+ return -1;
+ }
}
-
-
+
// metadata known, assign values
conf_service_add_metadata(service, *md_node,
(const char *) xml_name,
type, merge, setting,
- brief, termlist, rank, sortkey_offset,
- mergekey_type);
-
- xmlFree(xml_name);
- xmlFree(xml_brief);
- xmlFree(xml_sortkey);
- xmlFree(xml_merge);
- xmlFree(xml_type);
- xmlFree(xml_termlist);
- xmlFree(xml_rank);
- xmlFree(xml_setting);
+ brief, termlist,
+ (const char *) xml_rank, sortkey_offset,
+ mergekey_type,
+ (const char *) xml_icu_chain,
+ (const char *) xml_limitmap,
+ (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)
int num_metadata = 0;
int num_sortkeys = 0;
int got_settings = 0;
-
+
// count num_metadata and num_sortkeys
for (n = node->children; n; n = n->next)
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);
}
}
}
- else if (!strcmp((const char *) n->name, "settings"))
- got_settings++;
- else if (!strcmp((const char *) n->name, (const char *) "targetprofiles"))
+ else if (!strcmp((const char *) n->name, "ccldirective"))
{
- if (service->targetprofiles)
+ char *name;
+ char *value;
+ if (!service->ccl_bibset)
+ service->ccl_bibset = ccl_qual_mk();
+ name = (char *) xmlGetProp(n, (xmlChar *) "name");
+ if (!name)
{
- yaz_log(YLOG_FATAL, "Can't repeat targetprofiles");
+ yaz_log(YLOG_FATAL, "ccldirective: missing @name");
return 0;
}
- if (!(service->targetprofiles =
- parse_targetprofiles(service->nmem, n)))
+ value = (char *) xmlGetProp(n, (xmlChar *) "value");
+ if (!value)
+ {
+ xmlFree(name);
+ yaz_log(YLOG_FATAL, "ccldirective: missing @value");
return 0;
+ }
+ ccl_qual_add_special(service->ccl_bibset, name, value);
+ xmlFree(value);
+ xmlFree(name);
}
- else if (!strcmp((const char *) n->name, "relevance"))
+ else if (!strcmp((const char *) n->name, "settings"))
+ got_settings++;
+ else if (!strcmp((const char *) n->name, "icu_chain"))
{
- if (service->relevance_pct)
+ if (!service->charsets)
+ service->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(service->charsets, n, 0))
{
- yaz_log(YLOG_LOG, "relevance may not repeat in service");
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
}
- else
+ }
+ else if (!strcmp((const char *) n->name, "relevance")
+ || !strcmp((const char *) n->name, "sort")
+ || !strcmp((const char *) n->name, "mergekey")
+ || !strcmp((const char *) n->name, "facet"))
+
+ {
+ if (!service->charsets)
+ service->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(service->charsets, n,
+ (const char *) n->name))
{
- service->relevance_pct = pp2_charset_create_xml(n);
- if (!service->relevance_pct)
- return 0;
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
+ return 0;
}
}
- else if (!strcmp((const char *) n->name, "sort"))
+ else if (!strcmp((const char *) n->name, (const char *) "metadata"))
{
- if (service->sort_pct)
+ if (n->children) // This is a <metadata> container, look at its content.
{
- yaz_log(YLOG_LOG, "sort may not repeat in service");
+ 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, "rank"))
+ {
+ char *rank_cluster = (char *) xmlGetProp(n, (xmlChar *) "cluster");
+ char *rank_debug = (char *) xmlGetProp(n, (xmlChar *) "debug");
+ char *rank_follow = (char *) xmlGetProp(n, (xmlChar *) "follow");
+ char *rank_lead = (char *) xmlGetProp(n, (xmlChar *) "lead");
+ char *rank_length= (char *) xmlGetProp(n, (xmlChar *) "length");
+ if (rank_cluster)
+ {
+ if (!strcmp(rank_cluster, "yes"))
+ service->rank_cluster = 1;
+ else if (!strcmp(rank_cluster, "no"))
+ service->rank_cluster = 0;
+ else
+ {
+ yaz_log(YLOG_FATAL, "service: rank@cluster boolean");
+ return 0;
+ }
}
- else
+ if (rank_debug)
{
- service->sort_pct = pp2_charset_create_xml(n);
- if (!service->sort_pct)
+ if (!strcmp(rank_debug, "yes"))
+ service->rank_debug = 1;
+ else if (!strcmp(rank_debug, "no"))
+ service->rank_debug = 0;
+ else
+ {
+ yaz_log(YLOG_FATAL, "service: rank@debug boolean");
return 0;
+ }
}
- }
- else if (!strcmp((const char *) n->name, "mergekey"))
- {
- if (service->mergekey_pct)
+ if (rank_follow)
{
- yaz_log(YLOG_LOG, "mergekey may not repeat in service");
- return 0;
+ service->rank_follow = atof(rank_follow);
}
- else
+ if (rank_lead)
+ {
+ service->rank_lead = atof(rank_lead);
+ }
+ if (rank_length)
{
- service->mergekey_pct = pp2_charset_create_xml(n);
- if (!service->mergekey_pct)
+ if (!strcmp(rank_length, "linear"))
+ service->rank_length = 2;
+ else if (!strcmp(rank_length, "log"))
+ service->rank_length = 1;
+ else if (!strcmp(rank_length, "none"))
+ service->rank_length = 0;
+ else
+ {
+ yaz_log(YLOG_FATAL, "service: rank@length linear|log|none");
return 0;
+ }
}
+ xmlFree(rank_cluster);
+ xmlFree(rank_debug);
+ xmlFree(rank_follow);
+ xmlFree(rank_lead);
+ xmlFree(rank_length);
}
- else if (!strcmp((const char *) n->name, (const char *) "metadata"))
+ else if (!strcmp((const char *) n->name, "sort-default"))
{
- if (parse_metadata(service, n, &md_node, &sk_node))
+ char *default_sort = (char *) xmlGetProp(n, (xmlChar *) "field");
+
+ if (default_sort && strcmp(default_sort, "")) {
+ service->default_sort = nmem_strdup(service->nmem, default_sort);
+ yaz_log(YLOG_LOG, "service %s: default sort order configured to: %s",
+ service_id ? service_id : "unnamed", default_sort);
+ }
+ else
+ {
+ yaz_log(YLOG_FATAL, "default sort order is invalid: %s", default_sort);
return 0;
+ }
+ xmlFree(default_sort);
}
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;
}
}
continue;
if (!strcmp((const char *) n->name, "settings"))
{
+ int ret;
xmlChar *src = xmlGetProp(n, (xmlChar *) "src");
if (src)
{
WRBUF w = wrbuf_alloc();
conf_dir_path(server->config, w, (const char *) src);
- settings_read_file(service, wrbuf_cstr(w), pass);
+ ret = settings_read_file(service, wrbuf_cstr(w), pass);
wrbuf_destroy(w);
xmlFree(src);
}
else
{
- settings_read_node(service, n, pass);
+ ret = settings_read_node(service, n, pass);
}
+ if (ret)
+ return 0;
}
}
}
}
- return service;
-}
-static char *parse_settings(struct conf_config *config,
- NMEM nmem, xmlNode *node)
-{
- xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
- char *r;
-
- if (src)
- {
- WRBUF w = wrbuf_alloc();
- conf_dir_path(config, w, (const char *) src);
- r = nmem_strdup(nmem, wrbuf_cstr(w));
- wrbuf_destroy(w);
- }
- else
{
- yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
- 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);
}
- xmlFree(src);
- return r;
+ return service;
}
-static void inherit_server_settings(struct conf_service *s)
+static int inherit_server_settings(struct conf_service *s)
{
+ int ret = 0;
struct conf_server *server = s->server;
if (!s->dictionary) /* service has no config settings ? */
{
- if (server->server_settings)
+ if (server->settings_fname)
{
/* inherit settings from server */
init_settings(s);
- settings_read_file(s, server->server_settings, 1);
- settings_read_file(s, server->server_settings, 2);
+ if (settings_read_file(s, server->settings_fname, 1))
+ ret = -1;
+ if (settings_read_file(s, server->settings_fname, 2))
+ ret = -1;
}
else
{
- yaz_log(YLOG_WARN, "service '%s' has no settings",
- s->id ? s->id : "unnamed");
+ yaz_log(YLOG_WARN, "server '%s' has no settings", s->id ? s->id : "unnamed");
init_settings(s);
}
}
-
- /* use relevance/sort/mergekey from server if not defined
+
+ /* use relevance/sort/mergekey/facet from server if not defined
for this service.. */
- if (!s->relevance_pct)
- {
- if (server->relevance_pct)
- {
- s->relevance_pct = server->relevance_pct;
- pp2_charset_incref(s->relevance_pct);
- }
- else
- s->relevance_pct = pp2_charset_create(0);
- }
-
- if (!s->sort_pct)
+ if (!s->charsets)
{
- if (server->sort_pct)
+ if (server->charsets)
{
- s->sort_pct = server->sort_pct;
- pp2_charset_incref(s->sort_pct);
+ s->charsets = server->charsets;
+ pp2_charset_fact_incref(s->charsets);
}
else
- s->sort_pct = pp2_charset_create(0);
- }
-
- if (!s->mergekey_pct)
- {
- if (server->mergekey_pct)
{
- s->mergekey_pct = server->mergekey_pct;
- pp2_charset_incref(s->mergekey_pct);
+ s->charsets = pp2_charset_fact_create();
}
- else
- s->mergekey_pct = pp2_charset_create(0);
}
+ return ret;
}
struct conf_service *service_create(struct conf_server *server,
xmlNode *node)
{
- struct conf_service *service = service_create_static(server,
- node, 0);
+ struct conf_service *service = service_create_static(server, node, 0);
if (service)
{
inherit_server_settings(service);
- resolve_databases(service);
+ assert(service->mutex == 0);
+ pazpar2_mutex_create(&service->mutex, "conf");
}
return service;
}
{
xmlNode *n;
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;
server->myurl = 0;
- server->proxy_addr = 0;
server->service = 0;
server->config = config;
server->next = 0;
- server->relevance_pct = 0;
- server->sort_pct = 0;
- server->mergekey_pct = 0;
- server->server_settings = 0;
+ server->charsets = 0;
+ server->http_server = 0;
+ server->iochan_man = 0;
+ server->settings_fname = 0;
+ if (server_id)
+ {
+ server->server_id = nmem_strdup(nmem, (const char *)server_id);
+ xmlFree(server_id);
+ }
+ else
+ server->server_id = 0;
for (n = node->children; n; n = n->next)
{
if (n->type != XML_ELEMENT_NODE)
{
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);
}
}
else if (!strcmp((const char *) n->name, "settings"))
{
- if (server->server_settings)
+ xmlChar *src = xmlGetProp(n, (xmlChar *) "src");
+ WRBUF w;
+ if (!src)
{
- yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
+ yaz_log(YLOG_FATAL, "Missing src attribute for settings");
return 0;
}
- if (!(server->server_settings = parse_settings(config, nmem, n)))
- return 0;
- }
- else if (!strcmp((const char *) n->name, "relevance"))
- {
- server->relevance_pct = pp2_charset_create_xml(n);
- if (!server->relevance_pct)
+ if (server->settings_fname)
+ {
+ xmlFree(src);
+ yaz_log(YLOG_FATAL, "Can't repeat 'settings'");
return 0;
+ }
+ w = wrbuf_alloc();
+ conf_dir_path(config, w, (const char *) src);
+ server->settings_fname = nmem_strdup(nmem, wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ xmlFree(src);
}
- else if (!strcmp((const char *) n->name, "sort"))
+ else if (!strcmp((const char *) n->name, "icu_chain"))
{
- server->sort_pct = pp2_charset_create_xml(n);
- if (!server->sort_pct)
+ if (!server->charsets)
+ server->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(server->charsets, n, 0))
+ {
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
+ }
}
- else if (!strcmp((const char *) n->name, "mergekey"))
+ else if (!strcmp((const char *) n->name, "relevance")
+ || !strcmp((const char *) n->name, "sort")
+ || !strcmp((const char *) n->name, "mergekey")
+ || !strcmp((const char *) n->name, "facet"))
{
- server->mergekey_pct = pp2_charset_create_xml(n);
- if (!server->mergekey_pct)
+ if (!server->charsets)
+ server->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(server->charsets, n,
+ (const char *) n->name))
+ {
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
+ }
}
else if (!strcmp((const char *) n->name, "service"))
{
}
else if (!(*sp)->id && !service_id)
{
- yaz_log(YLOG_FATAL, "Duplicate unnamed service '%s'",
- service_id);
+ yaz_log(YLOG_FATAL, "Duplicate unnamed service");
break;
}
return 0;
}
}
+ if (!server->port)
+ {
+ yaz_log(YLOG_FATAL, "No listening port given");
+ return 0;
+ }
if (server->service)
{
struct conf_service *s;
return server;
}
-xsltStylesheet *conf_load_stylesheet(struct conf_service *service,
- const char *fname)
+WRBUF conf_get_fname(struct conf_config *config, const char *fname)
{
- struct conf_config *config = service->server->config;
WRBUF w = wrbuf_alloc();
- xsltStylesheet *s;
conf_dir_path(config, w, fname);
- s = xsltParseStylesheetFile((xmlChar *) wrbuf_cstr(w));
- wrbuf_destroy(w);
- return s;
+ return w;
}
-static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
- xmlNode *node)
+struct conf_service *locate_service(struct conf_server *server,
+ const char *service_id)
{
- struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r));
- xmlChar *type = xmlGetProp(node, (xmlChar *) "type");
- xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
+ struct conf_service *s = server->service;
+ for (; s; s = s->next)
+ if (s->id && service_id && 0 == strcmp(s->id, service_id))
+ break;
+ else if (!s->id && !service_id)
+ break;
+ if (s)
+ service_incref(s);
+ return s;
+}
- memset(r, 0, sizeof(*r));
+static void info_service_metadata(struct conf_service *service, WRBUF w)
+{
+ int i;
+ struct conf_metadata *md;
- if (type)
+ if (service->num_metadata)
{
- if (!strcmp((const char *) type, "local"))
- r->type = Targetprofiles_local;
- else
+ for (i = 0; i < service->num_metadata; i++)
{
- yaz_log(YLOG_FATAL, "Unknown targetprofile type");
- return 0;
+ 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;
+ case Metadata_type_retrieval:
+ wrbuf_puts(w, "retrieval");
+ 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;
+ default:
+ 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");
}
}
- else
- {
- yaz_log(YLOG_FATAL, "Must specify type for targetprofile");
- return 0;
- }
+}
- if (src)
- r->src = nmem_strdup(nmem, (const char *) src);
- else
+static void info_service_databases(struct conf_service *service, WRBUF w)
+{
+
+ if (service->databases)
{
- yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
- return 0;
+ struct database *db;
+ wrbuf_puts(w, " <databases>\n");
+ for (db = service->databases; db; db = db->next)
+ {
+ int i;
+ 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++)
+ {
+ struct setting *s = db->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, "\"");
+ wrbuf_puts(w, " />\n");
+ }
+ }
+ wrbuf_puts(w, " </database>\n");
+ }
+ wrbuf_puts(w, " </databases>\n");
}
- xmlFree(type);
- xmlFree(src);
- return r;
}
-struct conf_service *locate_service(struct conf_server *server,
- const char *service_id)
+void info_services(struct conf_server *server, WRBUF w)
{
struct conf_service *s = server->service;
+ int i;
+
+ wrbuf_puts(w, " <services>\n");
for (; s; s = s->next)
- if (s->id && service_id && 0 == strcmp(s->id, service_id))
- return s;
- else if (!s->id && !service_id)
- return s;
- return 0;
+ {
+ wrbuf_puts(w, " <service");
+ if (s->id)
+ {
+ wrbuf_puts(w, " id=\"");
+ wrbuf_xmlputs(w, s->id);
+ wrbuf_puts(w, "\"");
+ }
+ wrbuf_puts(w, ">\n");
+ if (s->settings)
+ {
+ for (i = 0; i < s->settings->num_settings; i++)
+ {
+ 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)
+ {
+ wrbuf_puts(w, " target=\"");
+ wrbuf_xmlputs(w, S->target);
+ wrbuf_puts(w, "\"");
+ }
+ wrbuf_puts(w, " />\n");
+ }
+ }
+ }
+ info_service_metadata(s, w);
+ info_service_databases(s, w);
+ wrbuf_puts(w, " </service>\n");
+ }
+ wrbuf_puts(w, " </services>\n");
}
-
static int parse_config(struct conf_config *config, xmlNode *root)
{
xmlNode *n;
tmp->next = config->servers;
config->servers = tmp;
}
- else if (!strcmp((const char *) n->name, "targetprofiles"))
- {
- yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service");
- return -1;
-
- }
- else
+ else if (!strcmp((const char *) n->name, "threads"))
{
- yaz_log(YLOG_FATAL, "Bad element: %s", n->name);
- return -1;
+ xmlChar *number = xmlGetProp(n, (xmlChar *) "number");
+ if (number)
+ {
+ config->no_threads = atoi((const char *) number);
+ xmlFree(number);
+ }
}
- }
- return 0;
-}
-
-static int process_config_includes(struct conf_config *config, xmlNode *n);
-
-static int config_include_one(struct conf_config *config, xmlNode **sib,
- const char *path)
-{
- struct stat st;
- if (stat(path, &st) < 0)
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "stat %s", path);
- return -1;
- }
- else
- {
- if ((st.st_mode & S_IFMT) == S_IFREG)
+ else if (!strcmp((const char *) n->name, "sockets"))
{
- xmlDoc *doc = xmlParseFile(path);
- if (doc)
+ xmlChar *number = xmlGetProp(n, (xmlChar *) "max");
+ if (number)
{
- xmlNodePtr t = xmlDocGetRootElement(doc);
- int ret = process_config_includes(config, t);
- *sib = xmlAddNextSibling(*sib, xmlCopyNode(t, 1));
- xmlFreeDoc(doc);
- if (ret)
- return -1;
+ config->max_sockets = atoi((const char *) number);
+ xmlFree(number);
}
- else
+ }
+ else if (!strcmp((const char *) n->name, "file"))
+ {
+ xmlChar *path = xmlGetProp(n, (xmlChar *) "path");
+ if (path)
{
- yaz_log(YLOG_FATAL, "Could not parse %s", path);
- return -1;
+ config->path = nmem_strdup(config->nmem, (const char *) path);
+ xmlFree(path);
}
}
- }
- return 0;
-}
-
-static int config_include_src(struct conf_config *config, xmlNode **np,
- const char *src)
-{
- int ret = 0; /* return code. OK so far */
- WRBUF w = wrbuf_alloc();
- xmlNodePtr sib; /* our sibling that we append */
- xmlNodePtr c; /* tmp node */
-
- wrbuf_printf(w, " begin include src=\"%s\" ", src);
-
- /* replace include element with a 'begin' comment */
- sib = xmlNewComment((const xmlChar *) wrbuf_cstr(w));
- xmlReplaceNode(*np, sib);
-
- xmlFreeNode(*np);
-
- wrbuf_rewind(w);
- conf_dir_path(config, w, src);
-#if USE_POSIX_GLOB
- {
- size_t i;
- glob_t glob_res;
- glob(wrbuf_cstr(w), 0 /* flags */, 0 /* errfunc */, &glob_res);
-
- for (i = 0; ret == 0 && i < glob_res.gl_pathc; i++)
+ else if (!strcmp((const char *) n->name, "targetprofiles"))
{
- const char *path = glob_res.gl_pathv[i];
- ret = config_include_one(config, &sib, path);
- }
- globfree(&glob_res);
- }
-#else
- ret = config_include_one(config, &sib, wrbuf_cstr(w));
-#endif
- wrbuf_rewind(w);
- wrbuf_printf(w, " end include src=\"%s\" ", src);
- c = xmlNewComment((const xmlChar *) wrbuf_cstr(w));
- sib = xmlAddNextSibling(sib, c);
-
- *np = sib;
- wrbuf_destroy(w);
- return ret;
-}
+ yaz_log(YLOG_FATAL, "targetprofiles unsupported here. Must be part of service");
+ return -1;
-static int process_config_includes(struct conf_config *config, xmlNode *n)
-{
- for (; n; n = n->next)
- {
- if (n->type == XML_ELEMENT_NODE)
+ }
+ else
{
- if (!strcmp((const char *) n->name, "include"))
- {
- xmlChar *src = xmlGetProp(n, (xmlChar *) "src");
- if (src)
- {
- int ret = config_include_src(config, &n,
- (const char *) src);
- xmlFree(src);
- if (ret)
- return ret;
-
- }
- }
- else
- {
- if (process_config_includes(config, n->children))
- return -1;
- }
+ yaz_log(YLOG_FATAL, "Bad element: %s", n->name);
+ return -1;
}
}
return 0;
}
-struct conf_config *config_create(const char *fname, int verbose)
+struct conf_config *config_create(const char *fname)
{
- 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->path = nmem_strdup(nmem, ".");
+ config->no_threads = 0;
+ config->max_sockets = 0;
+ config->iochan_man = 0;
config->confdir = wrbuf_alloc();
- if ((p = strrchr(fname,
+ if ((p = strrchr(fname,
#ifdef WIN32
'\\'
#else
wrbuf_write(config->confdir, fname, len);
}
wrbuf_puts(config->confdir, "");
-
+
n = xmlDocGetRootElement(doc);
- r = process_config_includes(config, n);
+ 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);
- xmlDocFormatDump(yaz_log_file(), doc, 0);
- }
+#ifndef WIN32
+ yaz_log(YLOG_LOG, "Configuration %s after include processing",
+ fname);
+#if LIBXML_VERSION >= 20600
+ xmlDocFormatDump(yaz_log_file(), doc, 0);
+#else
+ xmlDocDump(yaz_log_file(), doc);
+#endif
+#endif
r = parse_config(config, n);
}
xmlFreeDoc(doc);
service_destroy(s);
s = s_next;
}
- pp2_charset_destroy(server->relevance_pct);
- pp2_charset_destroy(server->sort_pct);
- pp2_charset_destroy(server->mergekey_pct);
+ pp2_charset_fact_destroy(server->charsets);
+ http_server_destroy(server->http_server);
}
void config_destroy(struct conf_config *config)
if (config)
{
struct conf_server *server = config->servers;
+ iochan_man_destroy(&config->iochan_man);
while (server)
{
struct conf_server *s_next = server->next;
http_close_server(ser);
}
-void config_start_databases(struct conf_config *conf)
+void config_process_events(struct conf_config *conf)
{
struct conf_server *ser;
+
for (ser = conf->servers; ser; ser = ser->next)
{
struct conf_service *s = ser->service;
+
for (;s ; s = s->next)
- resolve_databases(s);
+ {
+ assert(s->mutex == 0);
+ pazpar2_mutex_create(&s->mutex, "service");
+ }
+ http_mutex_init(ser);
}
+ iochan_man_events(conf->iochan_man);
}
int config_start_listeners(struct conf_config *conf,
- const char *listener_override)
+ const char *listener_override,
+ const char *record_fname)
{
struct conf_server *ser;
+
+ conf->iochan_man = iochan_man_create(conf->no_threads, conf->max_sockets);
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);
- wrbuf_destroy(w);
+ r = http_init(ser, record_fname);
if (r)
return -1;
projects / pazpar2-moved-to-github.git / blobdiff