/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
}
/** \brief parse retrieval XML config */
-static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
+static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr,
+ struct yaz_record_conv_type *types)
{
-
struct _xmlAttr *attr;
struct yaz_retrieval_elem *el = (struct yaz_retrieval_elem *)
nmem_malloc(p->nmem, sizeof(*el));
nmem_strdup(p->nmem, (const char *) attr->children->content);
else if (!xmlStrcmp(attr->name, BAD_CAST "name") &&
attr->children && attr->children->type == XML_TEXT_NODE)
- el->name =
+ el->name =
nmem_strdup(p->nmem, (const char *) attr->children->content);
else
{
{
if (ptr->type != XML_ELEMENT_NODE)
continue;
- if (strcmp((const char *) ptr->name, "backend")){
+ if (strcmp((const char *) ptr->name, "backend"))
+ {
wrbuf_printf(p->wr_error, "Element <retrieval>: expected"
" zero or one element <backend>, got <%s>",
(const char *) ptr->name);
return -1;
}
-
- else {
-
- /* parsing attributees */
+ else
+ {
struct _xmlAttr *attr;
- for (attr = ptr->properties; attr; attr = attr->next){
-
- if (!xmlStrcmp(attr->name, BAD_CAST "name")
- && attr->children
+ if (el->record_conv)
+ {
+ wrbuf_printf(p->wr_error, "Element <retrieval>: "
+ "only one <backend> allowed");
+ yaz_record_conv_destroy(el->record_conv);
+ return -1;
+ }
+ /* parsing attributees */
+ for (attr = ptr->properties; attr; attr = attr->next)
+ {
+ if (!xmlStrcmp(attr->name, BAD_CAST "name")
+ && attr->children
&& attr->children->type == XML_TEXT_NODE)
- el->backend_name
- = nmem_strdup(p->nmem,
+ el->backend_name
+ = nmem_strdup(p->nmem,
(const char *) attr->children->content);
- else if (!xmlStrcmp(attr->name, BAD_CAST "syntax")
- && attr->children
- && attr->children->type == XML_TEXT_NODE){
- el->backend_syntax
+ else if (!xmlStrcmp(attr->name, BAD_CAST "syntax")
+ && attr->children
+ && attr->children->type == XML_TEXT_NODE)
+ {
+ el->backend_syntax
= yaz_string_to_oid_odr(
yaz_oid_std(),
CLASS_RECSYN,
(const char *) attr->children->content,
p->odr);
- if (!el->backend_syntax){
- wrbuf_printf(p->wr_error,
+ if (!el->backend_syntax)
+ {
+ wrbuf_printf(p->wr_error,
"Element <backend syntax='%s'>: "
"attribute 'syntax' has invalid "
- "value '%s'",
+ "value '%s'",
attr->children->content,
attr->children->content);
return -1;
- }
+ }
}
- else {
+ else
+ {
wrbuf_printf(p->wr_error, "Element <backend>: expected "
- "attributes 'syntax' or 'name, got '%s'",
+ "attributes 'syntax' or 'name, got '%s'",
attr->name);
return -1;
}
}
-
-
- /* parsing internal of record conv */
+
+ /* parsing internal of record conv */
el->record_conv = yaz_record_conv_create();
-
+
yaz_record_conv_set_path(el->record_conv, p->path);
-
- if (yaz_record_conv_configure(el->record_conv, ptr))
+ if (yaz_record_conv_configure_t(el->record_conv, ptr, types))
{
wrbuf_printf(p->wr_error, "%s",
yaz_record_conv_get_error(el->record_conv));
}
}
}
-
+
*p->list_p = el;
p->list_p = &el->next;
return 0;
}
-int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr)
+int yaz_retrieval_configure_t(yaz_retrieval_t p, const xmlNode *ptr,
+ struct yaz_record_conv_type *types)
{
yaz_retrieval_reset(p);
continue;
if (!strcmp((const char *) ptr->name, "retrieval"))
{
- if (conf_retrieval(p, ptr))
+ if (conf_retrieval(p, ptr, types))
return -1;
}
else
{
wrbuf_printf(p->wr_error, "Element <retrievalinfo>: "
- "expected element <retrieval>, got <%s>",
+ "expected element <retrieval>, got <%s>",
ptr->name);
return -1;
}
return 0;
}
+int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr)
+{
+ return yaz_retrieval_configure_t(p, ptr, 0);
+}
+
int yaz_retrieval_request(yaz_retrieval_t p,
const char *schema, Odr_oid *syntax,
const char **match_schema, Odr_oid **match_syntax,
if (!el->name && !el->identifier)
schema_ok = 1;
}
-
+
if (syntax && el->syntax && !oid_oidcmp(syntax, el->syntax))
syntax_ok = 1;
if (!syntax)
if (backend_schema)
{
if (el->backend_name)
- *backend_schema = el->backend_name;
+ {
+ if (*el->backend_name)
+ *backend_schema = el->backend_name;
+ }
else if (el->name)
- *backend_schema = el->name;
+ *backend_schema = el->name;
else
*backend_schema = schema;
}