X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fretrieval.c;h=26d28fdbf4950e20ae061e246118d8f1ae0961a1;hp=982afc9c6b53cdd03e34527488b5be06d6f25a24;hb=3e11596504862f376b7340848715d6f549864660;hpb=7a98e9bfbb9d5fe7d44822a9838e3becbdce9363

diff --git a/src/retrieval.c b/src/retrieval.c
index 982afc9..26d28fd 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.21 2007-05-08 08:22:36 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>
 
@@ -109,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));
@@ -172,36 +171,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 {
-
-            /* parsing attributees */
+        else
+        {
             struct _xmlAttr *attr;
-            for (attr = ptr->properties; attr; attr = attr->next){
-            
+            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 */
+            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 +219,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,14 +228,12 @@ 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))
+            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));
@@ -241,7 +248,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
     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);
 
@@ -254,7 +262,7 @@ 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
@@ -274,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,
@@ -297,7 +310,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 +386,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