Fix crash in record conv rule select YAZ-812

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

diff --git a/src/retrieval.c b/src/retrieval.c
index 1515664..4c2920a 100644 (file)
--- a/src/retrieval.c
+++ b/src/retrieval.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -108,7 +108,8 @@ 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 *)
@@ -146,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
         {
@@ -190,18 +191,18 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
             /* 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)
-                    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 
+
+                else if (!xmlStrcmp(attr->name, BAD_CAST "syntax")
+                         && attr->children
                          && attr->children->type == XML_TEXT_NODE)
                 {
-                    el->backend_syntax 
+                    el->backend_syntax
                         = yaz_string_to_oid_odr(
                             yaz_oid_std(),
                             CLASS_RECSYN,
@@ -209,30 +210,30 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
                             p->odr);
                     if (!el->backend_syntax)
                     {
-                        wrbuf_printf(p->wr_error, 
+                        wrbuf_printf(p->wr_error,
                                      "Element <backend syntax='%s'>: "
                                      "attribute 'syntax' has invalid "
-                                     "value '%s'", 
+                                     "value '%s'",
                                      attr->children->content,
                                      attr->children->content);
                         return -1;
-                    } 
+                    }
                 }
                 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;
                 }
             }
-          
+
              /* 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,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);
 
@@ -260,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 <retrievalinfo>: "
-                             "expected element <retrieval>, got <%s>", 
+                             "expected element <retrieval>, got <%s>",
                              ptr->name);
                 return -1;
             }
@@ -280,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,
@@ -310,7 +317,7 @@ int yaz_retrieval_request(yaz_retrieval_t p,
             if (!el->name && !el->identifier)
                 schema_ok = 1;
         }
-        
+
         if (syntax && el->syntax && !oid_oidcmp(syntax, el->syntax))
             syntax_ok = 1;
         if (!syntax)
@@ -330,9 +337,12 @@ int yaz_retrieval_request(yaz_retrieval_t p,
             if (backend_schema)
             {
                 if (el->backend_name)
-                    *backend_schema = el->backend_name;
+                {
+                    if (*el->backend_name)
+                        *backend_schema = el->backend_name;
+                }
                 else if (el->name)
-                    *backend_schema = el->name;                    
+                    *backend_schema = el->name;
                 else
                     *backend_schema = schema;
             }