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

diff --git a/src/retrieval.c b/src/retrieval.c
index 329f45e..724ff25 100644
--- a/src/retrieval.c
+++ b/src/retrieval.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2005-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: retrieval.c,v 1.20 2007-05-06 20:12:20 adam Exp $
+ * $Id: retrieval.c,v 1.22 2008-01-25 16:28:26 adam Exp $
  */
 /**
  * \file retrieval.c
@@ -19,6 +19,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 +56,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;
@@ -275,11 +276,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 +298,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;