X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Foid.c;h=6856de79b92beb5903fd05eadc70c2e4bd959d33;hp=6251102d64ab2c4947800cb0d7583291464c4ba5;hb=4ed0df89283b51f12daddfcce1eff246e6962a08;hpb=381bf177c2d16c3f19ad60d3fca0d644c6e9e064 diff --git a/util/oid.c b/util/oid.c index 6251102..6856de7 100644 --- a/util/oid.c +++ b/util/oid.c @@ -4,7 +4,19 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: oid.c,v $ - * Revision 1.11 1995-12-13 16:03:35 quinn + * 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 @@ -62,6 +74,7 @@ */ #include +#include static int z3950_prefix[] = { 1, 2, 840, 10003, -1 }; static int sr_prefix[] = { 1, 0, 10163, -1 }; @@ -111,6 +124,7 @@ static oident oids[] = #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" }, @@ -278,7 +292,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) @@ -293,12 +307,12 @@ int *oid_getoidbyent(struct oident *ent) 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; return VAL_NONE; }