int rank,
int sortkey_offset,
enum conf_metadata_mergekey mt,
- const char *facetrule)
+ const char *facetrule,
+ const char *limitmap,
+ const char *frank)
{
assert(nmem && metadata && name);
metadata->sortkey_offset = sortkey_offset;
metadata->mergekey = mt;
metadata->facetrule = nmem_strdup_null(nmem, facetrule);
+ metadata->limitmap = nmem_strdup_null(nmem, limitmap);
+ metadata->frank = nmem_strdup_null(nmem, frank);
}
sortkey->type = type;
}
-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->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
service->sortkeys
= nmem_malloc(nmem,
sizeof(struct conf_sortkey) * service->num_sortkeys);
- service->dictionary = 0;
+
+
return service;
}
int rank,
int sortkey_offset,
enum conf_metadata_mergekey mt,
- const char *facetrule)
+ const char *facetrule,
+ const char *limitmap,
+ const char *frank
+ )
{
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, facetrule);
+ mt, facetrule, limitmap, frank);
return md;
}
xmlChar *xml_rank = 0;
xmlChar *xml_setting = 0;
xmlChar *xml_mergekey = 0;
+ xmlChar *xml_limitmap = 0;
xmlChar *xml_icu_chain = 0;
+ xmlChar *xml_frank = 0;
+
struct _xmlAttr *attr;
for (attr = n->properties; attr; attr = attr->next)
{
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 "frank") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ xml_frank = attr->children->content;
else
{
yaz_log(YLOG_FATAL, "Unknown metadata attribute '%s'", attr->name);
(const char *) xml_name,
type, merge, setting,
brief, termlist, rank, sortkey_offset,
- mergekey_type, (const char *) xml_icu_chain);
+ mergekey_type,
+ (const char *) xml_icu_chain,
+ (const char *) xml_limitmap,
+ (const char *) xml_frank);
(*md_node)++;
return 0;
}
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
{
yaz_log(YLOG_FATAL, "Bad element: %s", n->name);
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 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 ? */
{
{
/* inherit settings from server */
init_settings(s);
- settings_read_file(s, server->settings_fname, 1);
- settings_read_file(s, server->settings_fname, 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);
}
}
s->charsets = pp2_charset_fact_create();
}
}
+ 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);