* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: retrieval.c,v 1.3 2006-05-07 14:48:25 adam Exp $
+ * $Id: retrieval.c,v 1.12 2006-10-10 09:13:52 adam Exp $
*/
/**
* \file retrieval.c
#include <yaz/tpath.h>
#include <yaz/proto.h>
-#if HAVE_XSLT
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xinclude.h>
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
/** \brief The internal structure for yaz_retrieval_t */
struct yaz_retrieval_struct {
struct yaz_retrieval_elem {
/** \brief schema identifier */
const char *identifier;
- /** \brief schema short-hand (such sa "dc") */
- const char *schema;
+ /** \brief schema name , short-hand such sa "dc" */
+ const char *name;
/** \brief record syntax */
int *syntax;
- /** \brief backend schema */
- const char *backend_schema;
+ /** \brief backend name */
+ const char *backend_name;
/** \brief backend syntax */
int *backend_syntax;
el->syntax = 0;
el->identifier = 0;
- el->schema = 0;
- el->backend_schema = 0;
+ el->name = 0;
+ el->backend_name = 0;
el->backend_syntax = 0;
el->next = 0;
}
}
else if (!xmlStrcmp(attr->name, BAD_CAST "identifier") &&
- attr->children && attr->children->type == XML_TEXT_NODE)
+ attr->children && attr->children->type == XML_TEXT_NODE)
el->identifier =
nmem_strdup(p->nmem, (const char *) attr->children->content);
else if (!xmlStrcmp(attr->name, BAD_CAST "schema") &&
attr->children && attr->children->type == XML_TEXT_NODE)
- el->schema =
+ {
+ wrbuf_printf(p->wr_error, "Bad attribute 'schema'. "
+ "Use 'name' instead");
+ return -1;
+ }
+ else if (!xmlStrcmp(attr->name, BAD_CAST "name") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ el->name =
nmem_strdup(p->nmem, (const char *) attr->children->content);
else if (!xmlStrcmp(attr->name, BAD_CAST "backendschema") &&
attr->children && attr->children->type == XML_TEXT_NODE)
- el->backend_schema =
+ {
+ wrbuf_printf(p->wr_error, "Bad attribute 'backendschema'. "
+ "Use 'backendname' instead");
+ return -1;
+ }
+ else if (!xmlStrcmp(attr->name, BAD_CAST "backendname") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ el->backend_name =
nmem_strdup(p->nmem, (const char *) attr->children->content);
else if (!xmlStrcmp(attr->name, BAD_CAST "backendsyntax") &&
attr->children && attr->children->type == XML_TEXT_NODE)
}
if (!el->syntax)
{
- wrbuf_printf(p->wr_error, "Missing 'syntax' attribute.", attr->name);
+ wrbuf_printf(p->wr_error, "Missing 'syntax' attribute");
return -1;
}
int **backend_syntax)
{
struct yaz_retrieval_elem *el = p->list;
-
int syntax_matches = 0;
int schema_matches = 0;
+
+ wrbuf_rewind(p->wr_error);
+ if (!el)
+ return 0;
for(; el; el = el->next)
{
int schema_ok = 0;
int syntax_ok = 0;
- if (schema && el->schema && !strcmp(schema, el->schema))
- schema_ok = 1;
- if (schema && el->identifier && !strcmp(schema, el->identifier))
- schema_ok = 1;
if (!schema)
schema_ok = 1;
+ else
+ {
+ if (el->name && !strcmp(schema, el->name))
+ schema_ok = 1;
+ if (el->identifier && !strcmp(schema, el->identifier))
+ schema_ok = 1;
+ if (!el->name && !el->identifier)
+ schema_ok = 1;
+ }
if (syntax && el->syntax && !oid_oidcmp(syntax, el->syntax))
syntax_ok = 1;
if (syntax_ok && schema_ok)
{
*match_syntax = el->syntax;
- *match_schema = el->schema;
+ if (el->identifier)
+ *match_schema = el->identifier;
+ else
+ *match_schema = 0;
if (backend_schema)
- *backend_schema = el->backend_schema;
+ {
+ if (el->backend_name)
+ *backend_schema = el->backend_name;
+ else if (el->name)
+ *backend_schema = el->name;
+ else
+ *backend_schema = schema;
+ }
if (backend_syntax)
- *backend_syntax = el->backend_syntax;
+ {
+ if (el->backend_syntax)
+ *backend_syntax = el->backend_syntax;
+ else
+ *backend_syntax = el->syntax;
+ }
if (rc)
*rc = el->record_conv;
return 0;
}
}
- if (syntax_matches && !schema_matches)
- return 1;
- if (!syntax_matches && schema_matches)
+ if (!syntax_matches && syntax)
+ {
+ char buf[OID_STR_MAX];
+ wrbuf_printf(p->wr_error, "%s", oid_to_dotstring(syntax, buf));
return 2;
- if (!syntax_matches && !schema_matches)
- return 3;
- return 4;
+ }
+ if (schema)
+ wrbuf_printf(p->wr_error, "%s", schema);
+ if (!schema_matches)
+ return 1;
+ return 3;
}
const char *yaz_retrieval_get_error(yaz_retrieval_t p)