* Copyright (C) 2005-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: retrieval.c,v 1.2 2006-05-05 18:37:08 adam Exp $
+ * $Id: retrieval.c,v 1.10 2006-05-09 13:39:47 adam Exp $
*/
/**
* \file retrieval.c
#include <yaz/xmalloc.h>
#include <yaz/nmem.h>
#include <yaz/tpath.h>
+#include <yaz/proto.h>
-#if HAVE_XSLT
+#if 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 {
- /** \brief memory for configuration */
+ /** \brief ODR memory for configuration */
+ ODR odr;
+
+ /** \brief odr's NMEM memory (odr->mem) */
NMEM nmem;
/** \brief string buffer for error messages */
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 */
- const char *syntax;
- /** \brief backend schema */
- const char *backend_schema;
+ int *syntax;
+ /** \brief backend name */
+ const char *backend_name;
/** \brief backend syntax */
- const char *backend_syntax;
+ int *backend_syntax;
/** \brief record conversion */
yaz_record_conv_t record_conv;
- /** \breif next element in list */
+ /** \brief next element in list */
struct yaz_retrieval_elem *next;
};
yaz_retrieval_t yaz_retrieval_create()
{
yaz_retrieval_t p = xmalloc(sizeof(*p));
- p->nmem = nmem_create();
+ p->odr = odr_createmem(ODR_ENCODE);
+ p->nmem = p->odr->mem;
p->wr_error = wrbuf_alloc();
p->list = 0;
p->path = 0;
if (p)
{
yaz_retrieval_reset(p);
- nmem_destroy(p->nmem);
+ odr_destroy(p->odr);
wrbuf_free(p->wr_error, 1);
xfree(p->path);
xfree(p);
yaz_record_conv_destroy(el->record_conv);
wrbuf_rewind(p->wr_error);
- nmem_reset(p->nmem);
+ odr_reset(p->odr);
p->list = 0;
p->list_p = &p->list;
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;
{
if (!xmlStrcmp(attr->name, BAD_CAST "syntax") &&
attr->children && attr->children->type == XML_TEXT_NODE)
- el->syntax =
- nmem_strdup(p->nmem, (const char *) attr->children->content);
+ {
+ el->syntax = yaz_str_to_z3950oid(
+ p->odr, CLASS_RECSYN,
+ (const char *) attr->children->content);
+ if (!el->syntax)
+ {
+ wrbuf_printf(p->wr_error, "Bad syntax '%s'",
+ (const char *) attr->children->content);
+ return -1;
+ }
+ }
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)
- el->backend_syntax =
- nmem_strdup(p->nmem, (const char *) attr->children->content);
+ {
+ el->backend_syntax = yaz_str_to_z3950oid(
+ p->odr, CLASS_RECSYN,
+ (const char *) attr->children->content);
+ if (!el->backend_syntax)
+ {
+ wrbuf_printf(p->wr_error, "Bad backendsyntax '%s'",
+ (const char *) attr->children->content);
+ return -1;
+ }
+ }
else
{
wrbuf_printf(p->wr_error, "Bad attribute '%s'.", attr->name);
return -1;
}
}
- 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->children))
+ if (!el->syntax)
{
- wrbuf_printf(p->wr_error, "%s",
- yaz_record_conv_get_error(el->record_conv));
- yaz_record_conv_destroy(el->record_conv);
+ wrbuf_printf(p->wr_error, "Missing 'syntax' attribute");
return -1;
}
+
+ el->record_conv = 0; /* OK to have no 'convert' sub content */
+ for (ptr = ptr->children; ptr; ptr = ptr->next)
+ {
+ if (ptr->type == XML_ELEMENT_NODE)
+ {
+ 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))
+ {
+ wrbuf_printf(p->wr_error, "%s",
+ yaz_record_conv_get_error(el->record_conv));
+ yaz_record_conv_destroy(el->record_conv);
+ return -1;
+ }
+ }
+ }
*p->list_p = el;
p->list_p = &el->next;
return 0;
}
-int yaz_retrieval_request(yaz_retrieval_t p, const char *schema,
- const char *syntax, yaz_record_conv_t *rc)
+int yaz_retrieval_request(yaz_retrieval_t p,
+ const char *schema, int *syntax,
+ const char **match_schema, int **match_syntax,
+ yaz_record_conv_t *rc,
+ const char **backend_schema,
+ int **backend_syntax)
{
+ struct yaz_retrieval_elem *el = p->list;
+ int syntax_matches = 0;
+ int schema_matches = 0;
+
wrbuf_rewind(p->wr_error);
- wrbuf_printf(p->wr_error, "yaz_retrieval_request: not implemented");
- return -1;
+ if (!el)
+ return 0;
+ for(; el; el = el->next)
+ {
+ int schema_ok = 0;
+ int syntax_ok = 0;
+
+ 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)
+ syntax_ok = 1;
+
+ if (syntax_ok)
+ syntax_matches++;
+ if (schema_ok)
+ schema_matches++;
+ if (syntax_ok && schema_ok)
+ {
+ *match_syntax = el->syntax;
+ if (el->identifier)
+ *match_schema = el->identifier;
+ else
+ *match_schema = 0;
+ if (backend_schema)
+ *backend_schema = el->backend_name;
+ if (backend_syntax)
+ *backend_syntax = el->backend_syntax;
+ if (rc)
+ *rc = el->record_conv;
+ return 0;
+ }
+ }
+ if (!syntax_matches && syntax)
+ {
+ char buf[OID_STR_MAX];
+ wrbuf_printf(p->wr_error, "%s", oid_to_dotstring(syntax, buf));
+ return 2;
+ }
+ 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)
projects / yaz-moved-to-github.git / blobdiff