/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 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>
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);
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;
NMEM nmem = service->nmem;
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);
}
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,
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,
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);
}
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 (!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
return s;
}
-void info_service_metadata(struct conf_service *service, WRBUF w)
+static void info_service_metadata(struct conf_service *service, WRBUF w)
{
int i;
struct conf_metadata *md;
}
if (md->sortkey_offset > 0) {
wrbuf_puts(w, " sortkey=\"");
- switch (service->sortkeys[md->sortkey_offset].type) {
- case Metadata_sortkey_relevance:
- wrbuf_puts(w, "relevance");
- break;
- case Metadata_sortkey_numeric:
- wrbuf_puts(w, "numeric");
- break;
- case Metadata_sortkey_skiparticle:
- wrbuf_puts(w, "skiparticle");
- break;
- case Metadata_sortkey_string:
- wrbuf_puts(w, "string");
- break;
- case Metadata_sortkey_position:
- wrbuf_puts(w, "position");
- break;
- }
- wrbuf_puts(w, "\"");
- }
-
- switch (md->type) {
- case Metadata_type_generic:
- break;
- case Metadata_type_year:
- wrbuf_puts(w, " type=\"year\"");
- break;
- case Metadata_type_date:
- wrbuf_puts(w, " type=\"date\"");
- 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\"");
+ switch (service->sortkeys[md->sortkey_offset].type)
+ {
+ case Metadata_type_relevance:
+ wrbuf_puts(w, "relevance");
break;
- case Metadata_merge_range:
- wrbuf_puts(w, " merge=\"range\"");
+ case Metadata_type_skiparticle:
+ wrbuf_puts(w, "skiparticle");
break;
- case Metadata_merge_all:
- wrbuf_puts(w, " merge=\"all\"");
+ case Metadata_type_position:
+ wrbuf_puts(w, "position");
break;
- case Metadata_merge_first:
- wrbuf_puts(w, " merge=\"first\"");
+ default:
+ wrbuf_puts(w, "yes");
break;
+ }
+ wrbuf_puts(w, "\"");
}
-
- 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;
+ 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");
}
}
}
-void info_service_databases(struct conf_service *service, WRBUF w)
+static void info_service_databases(struct conf_service *service, WRBUF w)
{
struct database *db;
struct setting *s;
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, "\"");
+ 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) {
+ while (s != NULL)
+ {
wrbuf_puts(w, " <setting");
wrbuf_puts(w, " name=\"");
wrbuf_xmlputs(w, s->name);
}
wrbuf_puts(w, " </database>\n");
}
-
wrbuf_puts(w, " </databases>\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);
}