X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fretrieval.c;h=f60e231ffe05447ce09f5ab469ad43e50f8ac6c5;hp=eecea4c1cef4d7c92d89b22a701ef6b6b741c7b4;hb=7d7e192def2fef342d235ea894eddb1e89edd714;hpb=ca44977409b92a8b1c7bfbc913a6422edc41d1d5 diff --git a/src/retrieval.c b/src/retrieval.c index eecea4c..f60e231 100644 --- a/src/retrieval.c +++ b/src/retrieval.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 2005-2006, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: retrieval.c,v 1.13 2006-12-12 10:41:38 marc 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; @@ -88,7 +88,7 @@ void yaz_retrieval_destroy(yaz_retrieval_t p) { yaz_retrieval_reset(p); odr_destroy(p->odr); - wrbuf_free(p->wr_error, 1); + wrbuf_destroy(p->wr_error); xfree(p->path); xfree(p); } @@ -112,7 +112,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) { 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 : " @@ -166,8 +169,9 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) el->record_conv = 0; /* OK to have no 'backend' sub content */ for (ptr = ptr->children; ptr; ptr = ptr->next) { - if (ptr->type == XML_ELEMENT_NODE - && 0 != strcmp((const char *) ptr->name, "backend")){ + if (ptr->type != XML_ELEMENT_NODE) + continue; + if (strcmp((const char *) ptr->name, "backend")){ wrbuf_printf(p->wr_error, "Element : expected" " zero or one element , got <%s>", (const char *) ptr->name); @@ -191,9 +195,11 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) && attr->children && attr->children->type == XML_TEXT_NODE){ el->backend_syntax - = yaz_str_to_z3950oid(p->odr, CLASS_RECSYN, - (const char *) attr->children->content); - + = 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 : " @@ -234,10 +240,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) return 0; } -int yaz_retrieval_configure(yaz_retrieval_t p, const void *ptr_v) +int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr) { - const xmlNode *ptr = ptr_v; - yaz_retrieval_reset(p); if (ptr && ptr->type == XML_ELEMENT_NODE && @@ -270,11 +274,11 @@ int yaz_retrieval_configure(yaz_retrieval_t p, const void *ptr_v) } 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; @@ -292,7 +296,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; @@ -340,7 +344,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) @@ -352,7 +356,7 @@ int yaz_retrieval_request(yaz_retrieval_t p, const char *yaz_retrieval_get_error(yaz_retrieval_t p) { - return wrbuf_buf(p->wr_error); + return wrbuf_cstr(p->wr_error); } void yaz_retrieval_set_path(yaz_retrieval_t p, const char *path) @@ -368,6 +372,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