enum conf_metadata_mergekey mt,
const char *facetrule,
const char *limitmap,
- const char *limitcluster
+ const char *limitcluster,
+ const char *icurule
)
{
struct conf_metadata * md = 0;
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;
}
xmlChar *xml_limitmap = 0;
xmlChar *xml_limitcluster = 0;
xmlChar *xml_icu_chain = 0;
+ xmlChar *xml_icurule = 0;
struct _xmlAttr *attr;
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);
mergekey_type,
(const char *) xml_icu_chain,
(const char *) xml_limitmap,
- (const char *) xml_limitcluster);
+ (const char *) xml_limitcluster,
+ (const char *) xml_icurule
+ );
(*md_node)++;
return 0;
}
case Metadata_type_position:
wrbuf_puts(w, "position");
break;
+ case Metadata_type_retrieval:
+ wrbuf_puts(w, "retrieval");
+ break;
default:
wrbuf_puts(w, "yes");
break;
return 0;
}
-struct conf_config *config_create(const char *fname, int verbose)
+struct conf_config *config_create(const char *fname)
{
xmlDoc *doc = xmlReadFile(fname,
NULL,
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);
+ yaz_log(YLOG_LOG, "Configuration %s after include processing",
+ fname);
#if LIBXML_VERSION >= 20600
- xmlDocFormatDump(yaz_log_file(), doc, 0);
+ xmlDocFormatDump(yaz_log_file(), doc, 0);
#else
- xmlDocDump(yaz_log_file(), doc);
+ xmlDocDump(yaz_log_file(), doc);
#endif
- }
r = parse_config(config, n);
}
xmlFreeDoc(doc);