projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.9.0
[yaz-moved-to-github.git]
/
src
/
retrieval.c
diff --git
a/src/retrieval.c
b/src/retrieval.c
index
26d28fd
..
b65a3f3
100644
(file)
--- a/
src/retrieval.c
+++ b/
src/retrieval.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-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)
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
{
nmem_strdup(p->nmem, (const char *) attr->children->content);
else
{
@@
-191,18
+191,18
@@
static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr,
/* parsing attributees */
for (attr = ptr->properties; attr; attr = attr->next)
{
/* parsing attributees */
for (attr = ptr->properties; attr; attr = attr->next)
{
- if (!xmlStrcmp(attr->name, BAD_CAST "name")
- && attr->children
+ if (!xmlStrcmp(attr->name, BAD_CAST "name")
+ && attr->children
&& attr->children->type == XML_TEXT_NODE)
&& 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);
(const char *) attr->children->content);
-
- else if (!xmlStrcmp(attr->name, BAD_CAST "syntax")
- && attr->children
+
+ 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
+ el->backend_syntax
= yaz_string_to_oid_odr(
yaz_oid_std(),
CLASS_RECSYN,
= yaz_string_to_oid_odr(
yaz_oid_std(),
CLASS_RECSYN,
@@
-210,24
+210,24
@@
static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr,
p->odr);
if (!el->backend_syntax)
{
p->odr);
if (!el->backend_syntax)
{
- wrbuf_printf(p->wr_error,
+ wrbuf_printf(p->wr_error,
"Element <backend syntax='%s'>: "
"attribute 'syntax' has invalid "
"Element <backend syntax='%s'>: "
"attribute 'syntax' has invalid "
- "value '%s'",
+ "value '%s'",
attr->children->content,
attr->children->content);
return -1;
attr->children->content,
attr->children->content);
return -1;
- }
+ }
}
else
{
wrbuf_printf(p->wr_error, "Element <backend>: expected "
}
else
{
wrbuf_printf(p->wr_error, "Element <backend>: expected "
- "attributes 'syntax' or 'name, got '%s'",
+ "attributes 'syntax' or 'name, got '%s'",
attr->name);
return -1;
}
}
attr->name);
return -1;
}
}
-
+
/* parsing internal of record conv */
el->record_conv = yaz_record_conv_create();
/* parsing internal of record conv */
el->record_conv = yaz_record_conv_create();
@@
-242,7
+242,7
@@
static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr,
}
}
}
}
}
}
-
+
*p->list_p = el;
p->list_p = &el->next;
return 0;
*p->list_p = el;
p->list_p = &el->next;
return 0;
@@
-268,7
+268,7
@@
int yaz_retrieval_configure_t(yaz_retrieval_t p, const xmlNode *ptr,
else
{
wrbuf_printf(p->wr_error, "Element <retrievalinfo>: "
else
{
wrbuf_printf(p->wr_error, "Element <retrievalinfo>: "
- "expected element <retrieval>, got <%s>",
+ "expected element <retrieval>, got <%s>",
ptr->name);
return -1;
}
ptr->name);
return -1;
}
@@
-297,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 = p->list;
int syntax_matches = 0;
int schema_matches = 0;
+ struct yaz_retrieval_elem *el_best = 0;
wrbuf_rewind(p->wr_error);
if (!el)
wrbuf_rewind(p->wr_error);
if (!el)
@@
-311,13
+312,13
@@
int yaz_retrieval_request(yaz_retrieval_t p,
else
{
if (el->name && yaz_match_glob(el->name, schema))
else
{
if (el->name && yaz_match_glob(el->name, schema))
- schema_ok = 1;
+ schema_ok = 2;
if (el->identifier && !strcmp(schema, el->identifier))
if (el->identifier && !strcmp(schema, el->identifier))
- schema_ok = 1;
+ schema_ok = 2;
if (!el->name && !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)
if (syntax && el->syntax && !oid_oidcmp(syntax, el->syntax))
syntax_ok = 1;
if (!syntax)
@@
-329,31
+330,40
@@
int yaz_retrieval_request(yaz_retrieval_t p,
schema_matches++;
if (syntax_ok && 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)
+ 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;
*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)
{
}
if (!syntax_matches && syntax)
{