#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <libxslt/xslt.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
#include <yaz/yaz-util.h>
#include <yaz/nmem.h>
NMEM nmem = nmem_create();
service = nmem_malloc(nmem, sizeof(struct conf_service));
+ service->ref_count = 1;
service->nmem = nmem;
service->next = 0;
service->settings = 0;
service->server = server;
service->session_timeout = 60; /* default session timeout */
service->z3950_session_timeout = 180;
- service->z3950_connect_timeout = 15;
+ service->z3950_operation_timeout = 30;
service->relevance_pct = 0;
service->sort_pct = 0;
wrbuf_puts(w, src);
}
-static void service_destroy(struct conf_service *service)
+void service_destroy(struct conf_service *service)
{
if (service)
{
- pp2_charset_destroy(service->relevance_pct);
- pp2_charset_destroy(service->sort_pct);
- pp2_charset_destroy(service->mergekey_pct);
- nmem_destroy(service->nmem);
+ assert(service->ref_count > 0);
+ service->ref_count--;
+ if (service->ref_count == 0)
+ {
+ pp2_charset_destroy(service->relevance_pct);
+ pp2_charset_destroy(service->sort_pct);
+ pp2_charset_destroy(service->mergekey_pct);
+ nmem_destroy(service->nmem);
+ }
}
}
+void service_incref(struct conf_service *service)
+{
+ service->ref_count++;
+}
+
static int parse_metadata(struct conf_service *service, xmlNode *n,
int *md_node, int *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;
+ }
}
xmlFree(xml_termlist);
xmlFree(xml_rank);
xmlFree(xml_setting);
+ xmlFree(xml_mergekey);
(*md_node)++;
return 0;
}
-static struct conf_service *service_create(struct conf_server *server,
- xmlNode *node,
- const char *service_id)
+static struct conf_service *service_create_static(struct conf_server *server,
+ xmlNode *node,
+ const char *service_id)
{
xmlNode *n;
int md_node = 0;
return 0;
}
}
- src = xmlGetProp(n, (xmlChar *) "z3950_connect");
+ src = xmlGetProp(n, (xmlChar *) "z3950_operation");
if (src)
{
- service->z3950_connect_timeout = atoi((const char *) src);
+ service->z3950_operation_timeout = atoi((const char *) src);
xmlFree(src);
if (service->z3950_session_timeout < 9)
{
- yaz_log(YLOG_FATAL, "Z39.50 connect timeout out of range");
+ yaz_log(YLOG_FATAL, "Z39.50 operation timeout out of range");
return 0;
}
}
return r;
}
-static void inherit_server_settings(struct conf_server *server)
+static void inherit_server_settings(struct conf_service *s)
{
- struct conf_service *s;
- for (s = server->service; s; s = s->next)
+ struct conf_server *server = s->server;
+ if (!s->dictionary) /* service has no config settings ? */
{
- if (!s->dictionary) /* service has no config settings ? */
+ if (server->server_settings)
{
- if (server->server_settings)
- {
- /* inherit settings from server */
- init_settings(s);
- settings_read_file(s, server->server_settings, 1);
- settings_read_file(s, server->server_settings, 2);
- }
- else
- {
- yaz_log(YLOG_WARN, "service '%s' has no settings",
- s->id ? s->id : "unnamed");
- init_settings(s);
- }
+ /* inherit settings from server */
+ init_settings(s);
+ settings_read_file(s, server->server_settings, 1);
+ settings_read_file(s, server->server_settings, 2);
}
-
- /* use relevance/sort/mergekey from server if not defined
- for this service.. */
- if (!s->relevance_pct)
+ else
{
- if (server->relevance_pct)
- {
- s->relevance_pct = server->relevance_pct;
- pp2_charset_incref(s->relevance_pct);
- }
- else
- s->relevance_pct = pp2_charset_create(0);
+ yaz_log(YLOG_WARN, "service '%s' has no settings",
+ s->id ? s->id : "unnamed");
+ init_settings(s);
}
-
- if (!s->sort_pct)
+ }
+
+ /* use relevance/sort/mergekey from server if not defined
+ for this service.. */
+ if (!s->relevance_pct)
+ {
+ if (server->relevance_pct)
{
- if (server->sort_pct)
- {
- s->sort_pct = server->sort_pct;
- pp2_charset_incref(s->sort_pct);
- }
- else
- s->sort_pct = pp2_charset_create(0);
+ s->relevance_pct = server->relevance_pct;
+ pp2_charset_incref(s->relevance_pct);
}
-
- if (!s->mergekey_pct)
+ else
+ s->relevance_pct = pp2_charset_create(0);
+ }
+
+ if (!s->sort_pct)
+ {
+ if (server->sort_pct)
{
- if (server->mergekey_pct)
- {
- s->mergekey_pct = server->mergekey_pct;
- pp2_charset_incref(s->mergekey_pct);
- }
- else
- s->mergekey_pct = pp2_charset_create(0);
+ s->sort_pct = server->sort_pct;
+ pp2_charset_incref(s->sort_pct);
}
+ 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);
+ }
+ else
+ s->mergekey_pct = pp2_charset_create(0);
}
}
+struct conf_service *service_create(struct conf_server *server,
+ xmlNode *node)
+{
+ struct conf_service *service = service_create_static(server,
+ node, 0);
+ if (service)
+ {
+ inherit_server_settings(service);
+ resolve_databases(service);
+ }
+ return service;
+}
+
static struct conf_server *server_create(struct conf_config *config,
NMEM nmem, xmlNode *node)
{
}
else
{
- struct conf_service *s = service_create(server, n,
- service_id);
+ struct conf_service *s = service_create_static(server, n,
+ service_id);
xmlFree(service_id);
if (!s)
return 0;
return 0;
}
}
- inherit_server_settings(server);
+ if (server->service)
+ {
+ struct conf_service *s;
+ for (s = server->service; s; s = s->next)
+ inherit_server_settings(s);
+ }
return server;
}
-xsltStylesheet *conf_load_stylesheet(struct conf_service *service,
- const char *fname)
+WRBUF conf_get_fname(struct conf_service *service, 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,
{
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
}
r = parse_config(config, n);
}