retrieval: only one <backend> section allowed

[yaz-moved-to-github.git] / src / retrieval.c

diff --git a/src/retrieval.c b/src/retrieval.c
index 329f45e..65c1098 100644 (file)
--- 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.20 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file retrieval.c
@@ -19,6 +17,7 @@
 #include <yaz/xmalloc.h>
 #include <yaz/nmem.h>
 #include <yaz/tpath.h>
+#include <yaz/match_glob.h>
 #include <yaz/proto.h>
 #include <yaz/oid_db.h>
 
@@ -55,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;
@@ -181,6 +180,14 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
 
         else {
 
+            if (el->record_conv)
+            {
+                wrbuf_printf(p->wr_error, "Element <retrieval>: "
+                             "only one <backend> allowed");
+                yaz_record_conv_destroy(el->record_conv);
+                return -1;
+            }
+
             /* parsing attributees */
             struct _xmlAttr *attr;
             for (attr = ptr->properties; attr; attr = attr->next){
@@ -275,11 +282,11 @@ int yaz_retrieval_configure(yaz_retrieval_t p, const xmlNode *ptr)
 }
 
 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;
@@ -297,7 +304,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;
@@ -373,6 +380,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