X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fretrieval.c;h=e0ed99848168fe88a52eebed5e8329422f5e5eae;hb=0ee6ed21c56ed2fbcdab586054f95d1be1107e1d;hp=329f45ef1ddef0d34bf1cb187a6e85a1ef1f0983;hpb=fe507b6b15788a3a8e58063d9dae52532a5229a5;p=yaz-moved-to-github.git

diff --git a/src/retrieval.c b/src/retrieval.c
index 329f45e..e0ed998 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.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;
@@ -111,7 +110,6 @@ void yaz_retrieval_reset(yaz_retrieval_t p)
 /** \brief parse retrieval XML config */
 static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
 {
-
     struct _xmlAttr *attr;
     struct yaz_retrieval_elem *el = (struct yaz_retrieval_elem *)
         nmem_malloc(p->nmem, sizeof(*el));
@@ -172,36 +170,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 <retrieval>: expected"
                          " zero or one element <backend>, got <%s>",
                          (const char *) ptr->name);
             return -1;
         }
-
-        else {
-
+        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){
-            
+            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_string_to_oid_odr(
                             yaz_oid_std(),
                             CLASS_RECSYN,
                             (const char *) attr->children->content,
                             p->odr);
-                    if (!el->backend_syntax){
+                    if (!el->backend_syntax)
+                    {
                         wrbuf_printf(p->wr_error, 
                                      "Element <backend syntax='%s'>: "
                                      "attribute 'syntax' has invalid "
@@ -211,7 +218,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
                         return -1;
                     } 
                 }
-                else {
+                else
+                {
                     wrbuf_printf(p->wr_error, "Element <backend>: expected "
                                  "attributes 'syntax' or 'name, got '%s'", 
                                  attr->name);
@@ -219,13 +227,11 @@ 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))
             {
                 wrbuf_printf(p->wr_error, "%s",
@@ -275,11 +281,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 +303,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 +379,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