X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fretrieval.c;h=eabdfec114a443d3eafb2987466dc75b734c9ba2;hp=e041a2faeb3612d31455edbb7f6974190c534468;hb=0e7513faa0f309121e7800827685f9bdccd2eeb9;hpb=401da56d4a26f687cd42024bdef6f29a29bb7663

diff --git a/src/retrieval.c b/src/retrieval.c
index e041a2f..eabdfec 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-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: retrieval.c,v 1.17 2007-03-19 14:40:07 adam Exp $
  */
 /**
  * \file retrieval.c
@@ -19,7 +17,9 @@
 #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>
 
 #if YAZ_HAVE_XML2
 #include <libxml/parser.h>
@@ -54,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;
@@ -72,9 +72,9 @@ static void yaz_retrieval_reset(yaz_retrieval_t p);
 
 yaz_retrieval_t yaz_retrieval_create()
 {
-    yaz_retrieval_t p = xmalloc(sizeof(*p));
+    yaz_retrieval_t p = (yaz_retrieval_t) xmalloc(sizeof(*p));
     p->odr = odr_createmem(ODR_ENCODE);
-    p->nmem = p->odr->mem;
+    p->nmem = odr_getmem(p->odr);
     p->wr_error = wrbuf_alloc();
     p->list = 0;
     p->path = 0;
@@ -112,7 +112,8 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
 {
 
     struct _xmlAttr *attr;
-    struct yaz_retrieval_elem *el = nmem_malloc(p->nmem, sizeof(*el));
+    struct yaz_retrieval_elem *el = (struct yaz_retrieval_elem *)
+        nmem_malloc(p->nmem, sizeof(*el));
 
     el->syntax = 0;
     el->identifier = 0;
@@ -127,9 +128,11 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
         if (!xmlStrcmp(attr->name, BAD_CAST "syntax") &&
             attr->children && attr->children->type == XML_TEXT_NODE)
         {
-            el->syntax = yaz_str_to_z3950oid(
-                p->odr, CLASS_RECSYN,
-                (const char *) attr->children->content);
+            el->syntax = yaz_string_to_oid_odr(
+                yaz_oid_std(),
+                CLASS_RECSYN,
+                (const char *) attr->children->content,
+                p->odr);
             if (!el->syntax)
             {
                 wrbuf_printf(p->wr_error, "Element <retrieval>: "
@@ -192,9 +195,11 @@ static int conf_retrieval(yaz_retrieval_t p, const xmlNode *ptr)
                          && attr->children 
                          && attr->children->type == XML_TEXT_NODE){
                     el->backend_syntax 
-                    = yaz_str_to_z3950oid(p->odr, CLASS_RECSYN,
-                       (const char *) attr->children->content);
-                    
+                        = yaz_string_to_oid_odr(
+                            yaz_oid_std(),
+                            CLASS_RECSYN,
+                            (const char *) attr->children->content,
+                            p->odr);
                     if (!el->backend_syntax){
                         wrbuf_printf(p->wr_error, 
                                      "Element <backend syntax='%s'>: "
@@ -269,11 +274,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;
@@ -291,7 +296,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;
@@ -339,7 +344,7 @@ int yaz_retrieval_request(yaz_retrieval_t p,
     if (!syntax_matches && syntax)
     {
         char buf[OID_STR_MAX];
-        wrbuf_printf(p->wr_error, "%s", oid_to_dotstring(syntax, buf));
+        wrbuf_printf(p->wr_error, "%s", oid_oid_to_dotstring(syntax, buf));
         return 2;
     }
     if (schema)