Support for private OID table added. Thanks to Ronald van der Meer

[yaz-moved-to-github.git] / util / oid.c

diff --git a/util/oid.c b/util/oid.c
index 3e6a926..ccfca7f 100644 (file)
--- a/util/oid.c
+++ b/util/oid.c
@@ -4,7 +4,34 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: oid.c,v $
- * Revision 1.10  1995-11-28 09:30:44  quinn
+ * Revision 1.19  1997-05-02 08:39:41  quinn
+ * Support for private OID table added. Thanks to Ronald van der Meer
+ *
+ * Revision 1.18  1997/04/30 08:52:12  quinn
+ * Null
+ *
+ * Revision 1.17  1996/10/10  12:35:23  quinn
+ * Added Update extended service.
+ *
+ * Revision 1.16  1996/10/09  15:55:02  quinn
+ * Added SearchInfoReport
+ *
+ * Revision 1.15  1996/10/07  15:29:43  quinn
+ * Added SOIF support
+ *
+ * Revision 1.14  1996/02/20  17:58:28  adam
+ * Added const to oid_getvalbyname.
+ *
+ * Revision 1.13  1996/02/20  16:37:33  quinn
+ * Using yaz_matchstr in oid_getvalbyname
+ *
+ * Revision 1.12  1996/01/02  08:57:53  quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.11  1995/12/13  16:03:35  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.10  1995/11/28  09:30:44  quinn
  * Work.
  *
  * Revision 1.9  1995/11/13  09:27:53  quinn
@@ -59,10 +86,13 @@
  */
 
 #include <oid.h>
+#include <yaz-util.h>
 
 static int z3950_prefix[] = { 1, 2, 840, 10003, -1 };
 static int sr_prefix[]    = { 1, 0, 10163, -1 };
 
+static oident *extoids = NULL;
+
 /*
  * OID database
  */
@@ -105,6 +135,10 @@ static oident oids[] =
     {PROTO_Z3950,   CLASS_RECSYN,  VAL_GRS0,      {5,104,-1},  "GRS-0"       },
     {PROTO_Z3950,   CLASS_RECSYN,  VAL_GRS1,      {5,105,-1},  "GRS-1"       },
     {PROTO_Z3950,   CLASS_RECSYN,  VAL_EXTENDED,  {5,106,-1},  "Extended"    },
+#if 0
+    {PROTO_Z3950,   CLASS_RECSYN,  VAL_ID_SGML,   {5,1000,81,1,-1},"ID-SGML" },
+#endif
+    {PROTO_Z3950,   CLASS_RECSYN,  VAL_SOIF,      {5,1000,81,2,-1},"SOIF" },
     {PROTO_Z3950,   CLASS_RESFORM, VAL_RESOURCE1, {7,1,-1},    "Resource-1"  },
     {PROTO_Z3950,   CLASS_RESFORM, VAL_RESOURCE2, {7,2,-1},    "Resource-2"  },
     {PROTO_Z3950,   CLASS_ACCFORM, VAL_PROMPT1,   {8,1,-1},    "Prompt-1"    },
@@ -117,6 +151,9 @@ static oident oids[] =
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_DBUPDATE,  {9,5,-1},    "DB. Update"  },
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_EXPORTSPEC,{9,6,-1},    "exp. spec."  },
     {PROTO_Z3950,   CLASS_EXTSERV, VAL_EXPORTINV, {9,7,-1},    "exp. inv."   },
+
+    {PROTO_Z3950,   CLASS_USERINFO,VAL_SEARCHRES1,{10,1,-1},  "searchResult-1"},
+
     {PROTO_Z3950,   CLASS_ELEMSPEC,VAL_ESPEC1,    {11,1,-1},   "Espec-1"     },
     {PROTO_Z3950,   CLASS_VARSET,  VAL_VAR1,      {12,1,-1},   "Variant-1"   },
 
@@ -250,15 +287,19 @@ struct oident *oid_getentbyoid(int *o)
     /* determine protocol type */
     if (!o)
         return 0;
-    if ((prelen = match_prefix(o, z3950_prefix)))
+    if ((prelen = match_prefix(o, z3950_prefix)) != 0)
         proto = PROTO_Z3950;
-    else if ((prelen = match_prefix(o, sr_prefix)))
+    else if ((prelen = match_prefix(o, sr_prefix)) != 0)
         proto = PROTO_SR;
     else
         proto = PROTO_GENERAL;
     for (p = oids; *p->oidsuffix >= 0; p++)
         if (p->proto == proto && !oid_oidcmp(o + prelen, p->oidsuffix))
             return p;
+    if (extoids != NULL)
+        for (p = extoids; *p->oidsuffix >= 0; p++)
+            if (p->proto == proto && !oid_oidcmp(o + prelen, p->oidsuffix))
+                return p;
     return 0;
 }
 
@@ -272,7 +313,7 @@ int *oid_getoidbyent(struct oident *ent)
 
     for (p = oids; *p->oidsuffix >= 0; p++)
         if (ent->proto == p->proto &&
-            ent->class == p->class &&
+            ent->oclass == p->oclass &&
             ent->value == p->value)
         {
             if (ent->proto == PROTO_Z3950)
@@ -284,15 +325,39 @@ int *oid_getoidbyent(struct oident *ent)
             oid_oidcat(ret, p->oidsuffix);
             return ret;
         }
+    if (extoids != NULL)
+        for (p = extoids; *p->oidsuffix >= 0; p++)
+           if (ent->proto == p->proto &&
+                ent->oclass == p->oclass &&
+                ent->value == p->value)
+            {
+                if (ent->proto == PROTO_Z3950)
+                    oid_oidcpy(ret, z3950_prefix);
+                else if (ent->proto == PROTO_SR)
+                    oid_oidcpy(ret, sr_prefix);
+                else
+                    ret[0] = -1;
+                oid_oidcat(ret, p->oidsuffix);
+                return ret;
+            }
     return 0;
 }
 
-oid_value oid_getvalbyname(char *name)
+oid_value oid_getvalbyname(const char *name)
 {
     struct oident *p;
 
     for (p = oids; *p->oidsuffix >= 0; p++)
-        if (!strcmp(p->desc, name))
+        if (!yaz_matchstr(p->desc, name))
             return p->value;
+    if (extoids != NULL)
+        for (p = extoids; *p->oidsuffix >= 0; p++)
+            if (!yaz_matchstr(p->desc, name))
+                return p->value;
     return VAL_NONE;
 }
+
+void oid_setprivateoids(oident *list)
+{
+    extoids = list;
+}