/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 2006-2011 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
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,
int termlist,
int rank,
int sortkey_offset,
- enum conf_metadata_mergekey mt)
+ enum conf_metadata_mergekey mt,
+ const char *facetrule)
{
assert(nmem && metadata && name);
metadata->rank = rank;
metadata->sortkey_offset = sortkey_offset;
metadata->mergekey = mt;
+ metadata->facetrule = nmem_strdup_null(nmem, facetrule);
}
service->next = 0;
service->settings = 0;
service->databases = 0;
- service->targetprofiles = 0;
service->server = server;
service->session_timeout = 60; /* default session timeout */
service->z3950_session_timeout = 180;
service->z3950_operation_timeout = 30;
- service->relevance_pct = 0;
- service->sort_pct = 0;
- service->mergekey_pct = 0;
- service->facet_pct = 0;
+ service->charsets = 0;
service->id = service_id ? nmem_strdup(nmem, service_id) : 0;
service->num_metadata = num_metadata;
int termlist,
int rank,
int sortkey_offset,
- enum conf_metadata_mergekey mt)
+ enum conf_metadata_mergekey mt,
+ const char *facetrule)
{
struct conf_metadata * md = 0;
md = service->metadata + field_id;
conf_metadata_assign(service->nmem, md, name, type, merge, setting,
brief, termlist, rank, sortkey_offset,
- mt);
+ mt, facetrule);
return md;
}
{
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);
- pp2_charset_destroy(service->facet_pct);
+ pp2_charset_fact_destroy(service->charsets);
yaz_mutex_destroy(&service->mutex);
nmem_destroy(service->nmem);
}
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_icu_chain = 0;
+ struct _xmlAttr *attr;
+ 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
+ {
+ 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)
{
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"))
return -1;
}
}
- else
- type = Metadata_type_generic;
if (xml_merge)
{
return -1;
}
}
- else
- merge = Metadata_merge_no;
if (xml_setting)
{
// add a sortkey if so specified
if (xml_sortkey && strcmp((const char *) xml_sortkey, "no"))
{
+ enum conf_sortkey_type sk_type;
if (merge == Metadata_merge_no)
{
yaz_log(YLOG_FATAL,
sortkey_offset = *sk_node;
conf_service_add_sortkey(service, *sk_node,
- (const char *) xml_name, sk_type);
-
+ (const char *) xml_name, sk_type);
(*sk_node)++;
}
else
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);
- xmlFree(xml_mergekey);
+ mergekey_type, (const char *) xml_icu_chain);
(*md_node)++;
return 0;
}
}
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, "icu_chain"))
{
- if (service->targetprofiles)
+ if (!service->charsets)
+ service->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(service->charsets, n, 0))
{
- yaz_log(YLOG_FATAL, "Can't repeat targetprofiles");
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
}
- if (!(service->targetprofiles =
- parse_targetprofiles(service->nmem, n)))
- return 0;
}
- else if (!strcmp((const char *) n->name, "relevance"))
- {
- if (service->relevance_pct)
- {
- yaz_log(YLOG_LOG, "relevance may not repeat in service");
- return 0;
- }
- else
- {
- service->relevance_pct = pp2_charset_create_xml(n);
- if (!service->relevance_pct)
- return 0;
- }
- }
- else if (!strcmp((const char *) n->name, "sort"))
- {
- if (service->sort_pct)
- {
- yaz_log(YLOG_LOG, "sort may not repeat in service");
- return 0;
- }
- else
- {
- service->sort_pct = pp2_charset_create_xml(n);
- if (!service->sort_pct)
- return 0;
- }
- }
- else if (!strcmp((const char *) n->name, "mergekey"))
- {
- if (service->mergekey_pct)
- {
- yaz_log(YLOG_LOG, "mergekey may not repeat in service");
- return 0;
- }
- else
- {
- service->mergekey_pct = pp2_charset_create_xml(n);
- if (!service->mergekey_pct)
- return 0;
- }
- }
- else if (!strcmp((const char *) n->name, "facet"))
+ 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->mergekey_pct)
+ if (!service->charsets)
+ service->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(service->charsets,
+ n->children, (const char *) n->name))
{
- yaz_log(YLOG_LOG, "facety may not repeat in service");
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
}
- else
- {
- service->facet_pct = pp2_charset_create_xml(n);
- if (!service->mergekey_pct)
- return 0;
- }
}
else if (!strcmp((const char *) n->name, (const char *) "metadata"))
{
/* use relevance/sort/mergekey/facet from server if not defined
for this service.. */
- if (!s->relevance_pct)
+ if (!s->charsets)
{
- if (server->relevance_pct)
+ if (server->charsets)
{
- s->relevance_pct = server->relevance_pct;
- pp2_charset_incref(s->relevance_pct);
+ s->charsets = server->charsets;
+ pp2_charset_fact_incref(s->charsets);
}
else
- s->relevance_pct = pp2_charset_create_a_to_z();
- }
-
- if (!s->sort_pct)
- {
- if (server->sort_pct)
{
- s->sort_pct = server->sort_pct;
- pp2_charset_incref(s->sort_pct);
+ s->charsets = pp2_charset_fact_create();
}
- else
- s->sort_pct = pp2_charset_create_a_to_z();
- }
-
- if (!s->mergekey_pct)
- {
- if (server->mergekey_pct)
- {
- s->mergekey_pct = server->mergekey_pct;
- pp2_charset_incref(s->mergekey_pct);
- }
- else
- s->mergekey_pct = pp2_charset_create_a_to_z();
- }
-
- if (!s->facet_pct)
- {
- if (server->facet_pct)
- {
- s->facet_pct = server->facet_pct;
- pp2_charset_incref(s->facet_pct);
- }
- else
- s->facet_pct = pp2_charset_create(0);
}
}
server->service = 0;
server->config = config;
server->next = 0;
- server->relevance_pct = 0;
- server->sort_pct = 0;
- server->mergekey_pct = 0;
- server->facet_pct = 0;
+ server->charsets = 0;
server->server_settings = 0;
server->http_server = 0;
server->iochan_man = 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)
- return 0;
- }
- else if (!strcmp((const char *) n->name, "sort"))
- {
- server->sort_pct = pp2_charset_create_xml(n);
- if (!server->sort_pct)
- return 0;
- }
- else if (!strcmp((const char *) n->name, "mergekey"))
+ else if (!strcmp((const char *) n->name, "icu_chain"))
{
- 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, 0))
+ {
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
+ }
}
- else if (!strcmp((const char *) n->name, "facet"))
+ 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->facet_pct = pp2_charset_create_xml(n);
- if (!server->facet_pct)
+ if (!server->charsets)
+ server->charsets = pp2_charset_fact_create();
+ if (pp2_charset_fact_define(server->charsets,
+ n->children, (const char *) n->name))
+ {
+ yaz_log(YLOG_FATAL, "ICU chain definition error");
return 0;
- }
+ }
+ }
else if (!strcmp((const char *) n->name, "service"))
{
char *service_id = (char *)
return w;
}
-static struct conf_targetprofiles *parse_targetprofiles(NMEM nmem,
- xmlNode *node)
-{
- struct conf_targetprofiles *r = nmem_malloc(nmem, sizeof(*r));
- xmlChar *type = xmlGetProp(node, (xmlChar *) "type");
- xmlChar *src = xmlGetProp(node, (xmlChar *) "src");
-
- memset(r, 0, sizeof(*r));
-
- if (type)
- {
- if (!strcmp((const char *) type, "local"))
- r->type = Targetprofiles_local;
- else
- {
- yaz_log(YLOG_FATAL, "Unknown targetprofile type");
- return 0;
- }
- }
- else
- {
- yaz_log(YLOG_FATAL, "Must specify type for targetprofile");
- return 0;
- }
-
- if (src)
- r->src = nmem_strdup(nmem, (const char *) src);
- else
- {
- yaz_log(YLOG_FATAL, "Must specify src in targetprofile");
- return 0;
- }
- xmlFree(type);
- xmlFree(src);
- return r;
-}
-
struct conf_service *locate_service(struct conf_server *server,
const char *service_id)
{
return s;
}
+void info_services(struct conf_server *server, WRBUF w)
+{
+ struct conf_service *s = server->service;
+ wrbuf_puts(w, " <services>\n");
+ for (; s; s = s->next)
+ {
+ wrbuf_puts(w, " <service");
+ if (s->id)
+ {
+ wrbuf_puts(w, " id=\"");
+ wrbuf_xmlputs(w, s->id);
+ wrbuf_puts(w, "\"");
+ }
+ wrbuf_puts(w, "/>");
+
+ wrbuf_puts(w, "\n");
+ }
+ wrbuf_puts(w, " </services>\n");
+}
static int parse_config(struct conf_config *config, xmlNode *root)
{
config->servers = 0;
config->no_threads = 0;
config->iochan_man = 0;
+ config->database_hosts = 0;
config->confdir = wrbuf_alloc();
if ((p = strrchr(fname,
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_destroy(server->facet_pct);
+ pp2_charset_fact_destroy(server->charsets);
yaz_log(YLOG_LOG, "server_destroy server=%p", server);
http_server_destroy(server->http_server);
}
}
int config_start_listeners(struct conf_config *conf,
- const char *listener_override)
+ const char *listener_override,
+ const char *record_fname)
{
struct conf_server *ser;
wrbuf_printf(w, "%d", ser->port);
}
}
- r = http_init(wrbuf_cstr(w), ser);
+ r = http_init(wrbuf_cstr(w), ser, record_fname);
wrbuf_destroy(w);
if (r)
return -1;
projects / pazpar2-moved-to-github.git / blobdiff