X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fretrieval.c;h=26d28fdbf4950e20ae061e246118d8f1ae0961a1;hp=e041a2faeb3612d31455edbb7f6974190c534468;hb=a3e65bcd3250b107397675bc65b35b5939355025;hpb=401da56d4a26f687cd42024bdef6f29a29bb7663 diff --git a/src/retrieval.c b/src/retrieval.c index e041a2f..26d28fd 100644 --- a/src/retrieval.c +++ b/src/retrieval.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2005-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2012 Index Data * See the file LICENSE for details. - * - * $Id: retrieval.c,v 1.17 2007-03-19 14:40:07 adam Exp $ */ /** * \file retrieval.c @@ -19,7 +17,9 @@ #include #include #include +#include #include +#include #if YAZ_HAVE_XML2 #include @@ -54,12 +54,12 @@ struct yaz_retrieval_elem { /** \brief schema name , short-hand such as "dc" */ const char *name; /** \brief record syntax */ - int *syntax; + Odr_oid *syntax; /** \brief backend name */ const char *backend_name; /** \brief backend syntax */ - int *backend_syntax; + Odr_oid *backend_syntax; /** \brief record conversion */ yaz_record_conv_t record_conv; @@ -72,9 +72,9 @@ static void yaz_retrieval_reset(yaz_retrieval_t p); yaz_retrieval_t yaz_retrieval_create() { - yaz_retrieval_t p = xmalloc(sizeof(*p)); + yaz_retrieval_t p = (yaz_retrieval_t) xmalloc(sizeof(*p)); p->odr = odr_createmem(ODR_ENCODE); - p->nmem = p->odr->mem; + p->nmem = odr_getmem(p->odr); p->wr_error = wrbuf_alloc(); p->list = 0; p->path = 0; @@ -108,11 +108,12 @@ void yaz_retrieval_reset(yaz_retrieval_t p) } /** \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 = nmem_malloc(p->nmem, sizeof(*el)); + struct yaz_retrieval_elem *el = (struct yaz_retrieval_elem *) + nmem_malloc(p->nmem, sizeof(*el)); el->syntax = 0; el->identifier = 0; @@ -127,9 +128,11 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) if (!xmlStrcmp(attr->name, BAD_CAST "syntax") && attr->children && attr->children->type == XML_TEXT_NODE) { - el->syntax = yaz_str_to_z3950oid( - p->odr, CLASS_RECSYN, - (const char *) attr->children->content); + el->syntax = yaz_string_to_oid_odr( + yaz_oid_std(), + CLASS_RECSYN, + (const char *) attr->children->content, + p->odr); if (!el->syntax) { wrbuf_printf(p->wr_error, "Element : " @@ -168,34 +171,45 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) { 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 : expected" " zero or one element , got <%s>", (const char *) ptr->name); return -1; } - - else { - - /* parsing attributees */ + else + { struct _xmlAttr *attr; - for (attr = ptr->properties; attr; attr = attr->next){ - + if (el->record_conv) + { + wrbuf_printf(p->wr_error, "Element : " + "only one 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, (const char *) attr->children->content); - + else if (!xmlStrcmp(attr->name, BAD_CAST "syntax") && attr->children - && attr->children->type == XML_TEXT_NODE){ + && attr->children->type == XML_TEXT_NODE) + { el->backend_syntax - = yaz_str_to_z3950oid(p->odr, CLASS_RECSYN, - (const char *) attr->children->content); - - if (!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, "Element : " "attribute 'syntax' has invalid " @@ -205,7 +219,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) return -1; } } - else { + else + { wrbuf_printf(p->wr_error, "Element : expected " "attributes 'syntax' or 'name, got '%s'", attr->name); @@ -213,14 +228,12 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) } } - - /* 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)); @@ -235,7 +248,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) 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); @@ -248,7 +262,7 @@ int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr) continue; if (!strcmp((const char *) ptr->name, "retrieval")) { - if (conf_retrieval(p, ptr)) + if (conf_retrieval(p, ptr, types)) return -1; } else @@ -268,12 +282,17 @@ int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr) 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, int *syntax, - const char **match_schema, int **match_syntax, + const char *schema, Odr_oid *syntax, + const char **match_schema, Odr_oid **match_syntax, yaz_record_conv_t *rc, const char **backend_schema, - int **backend_syntax) + Odr_oid **backend_syntax) { struct yaz_retrieval_elem *el = p->list; int syntax_matches = 0; @@ -291,7 +310,7 @@ int yaz_retrieval_request(yaz_retrieval_t p, schema_ok = 1; else { - if (el->name && !strcmp(schema, el->name)) + if (el->name && yaz_match_glob(el->name, schema)) schema_ok = 1; if (el->identifier && !strcmp(schema, el->identifier)) schema_ok = 1; @@ -339,7 +358,7 @@ int yaz_retrieval_request(yaz_retrieval_t p, if (!syntax_matches && syntax) { char buf[OID_STR_MAX]; - wrbuf_printf(p->wr_error, "%s", oid_to_dotstring(syntax, buf)); + wrbuf_printf(p->wr_error, "%s", oid_oid_to_dotstring(syntax, buf)); return 2; } if (schema) @@ -367,6 +386,7 @@ void yaz_retrieval_set_path(yaz_retrieval_t p, const char *path) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab