X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fretrieval.c;h=b65a3f39f0ae18b8b89eaf9107e7b6015c500bb7;hp=1adafbb3c5ec2fc012db4909f67519fabfd8dd0d;hb=f24766f1e9fc5404fc0b512af8607d7f7054f4be;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c diff --git a/src/retrieval.c b/src/retrieval.c index 1adafbb..b65a3f3 100644 --- a/src/retrieval.c +++ b/src/retrieval.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -108,9 +108,9 @@ 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 = (struct yaz_retrieval_elem *) nmem_malloc(p->nmem, sizeof(*el)); @@ -147,7 +147,7 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) 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 { @@ -171,61 +171,69 @@ 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 (!xmlStrcmp(attr->name, BAD_CAST "name") - && attr->children + 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, + 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 : " "attribute 'syntax' has invalid " - "value '%s'", + "value '%s'", attr->children->content, attr->children->content); return -1; - } + } } - else { + else + { wrbuf_printf(p->wr_error, "Element : 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)); @@ -234,13 +242,14 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr) } } } - + *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); @@ -253,13 +262,13 @@ 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 { wrbuf_printf(p->wr_error, "Element : " - "expected element , got <%s>", + "expected element , got <%s>", ptr->name); return -1; } @@ -273,6 +282,11 @@ 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, Odr_oid *syntax, const char **match_schema, Odr_oid **match_syntax, @@ -283,6 +297,7 @@ int yaz_retrieval_request(yaz_retrieval_t p, struct yaz_retrieval_elem *el = p->list; int syntax_matches = 0; int schema_matches = 0; + struct yaz_retrieval_elem *el_best = 0; wrbuf_rewind(p->wr_error); if (!el) @@ -297,13 +312,13 @@ int yaz_retrieval_request(yaz_retrieval_t p, else { if (el->name && yaz_match_glob(el->name, schema)) - schema_ok = 1; + schema_ok = 2; if (el->identifier && !strcmp(schema, el->identifier)) - schema_ok = 1; + schema_ok = 2; if (!el->name && !el->identifier) schema_ok = 1; } - + if (syntax && el->syntax && !oid_oidcmp(syntax, el->syntax)) syntax_ok = 1; if (!syntax) @@ -315,31 +330,40 @@ int yaz_retrieval_request(yaz_retrieval_t p, 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) + if (!el_best || schema_ok == 2) + el_best = el; + } + } + if (el_best) + { + el = el_best; + *match_syntax = el->syntax; + if (el->identifier) + *match_schema = el->identifier; + else + *match_schema = 0; + if (backend_schema) + { + if (el->backend_name) { - if (el->backend_name) + if (*el->backend_name) *backend_schema = el->backend_name; - else if (el->name) - *backend_schema = el->name; - else - *backend_schema = schema; - } - if (backend_syntax) - { - if (el->backend_syntax) - *backend_syntax = el->backend_syntax; - else - *backend_syntax = el->syntax; } - if (rc) - *rc = el->record_conv; - return 0; + else if (el->name) + *backend_schema = el->name; + else + *backend_schema = schema; } + if (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 && syntax) {