X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Foid.c;h=d1ce750911342dbac81835b8b2c84ebb0d40df78;hp=bc36e70260d0fc7bf8047cd9ef97651c3c225901;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hpb=7f4183f05884c781eb395a17e4282485c618ded6 diff --git a/util/oid.c b/util/oid.c index bc36e70..d1ce750 100644 --- a/util/oid.c +++ b/util/oid.c @@ -1,10 +1,79 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-1997, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: oid.c,v $ - * Revision 1.2 1995-08-21 09:11:16 quinn + * Revision 1.24 1997-09-29 13:19:00 adam + * Added function, oid_ent_to_oid, to replace the function + * oid_getoidbyent, which is not thread safe. + * + * Revision 1.23 1997/09/09 10:10:19 adam + * Another MSV5.0 port. Changed projects to include proper + * library/include paths. + * Server starts server in test-mode when no options are given. + * + * Revision 1.22 1997/08/29 13:34:58 quinn + * Added thesaurus oids + * + * Revision 1.21 1997/08/19 08:46:05 quinn + * Added Thesaurus OID + * + * Revision 1.20 1997/07/28 12:34:43 adam + * Added new OID entries (RVDM). + * + * 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 + * Fiddling with the variant stuff. + * + * Revision 1.8 1995/10/12 10:34:56 quinn + * Added Espec-1. + * + * Revision 1.7 1995/10/10 16:27:12 quinn + * *** empty log message *** + * + * Revision 1.6 1995/09/29 17:12:35 quinn + * Smallish + * + * Revision 1.5 1995/09/29 17:01:51 quinn + * More Windows work + * + * Revision 1.4 1995/09/27 15:03:03 quinn + * Modified function heads & prototypes. + * + * Revision 1.3 1995/09/12 11:32:06 quinn + * Added a looker-upper by name. + * + * Revision 1.2 1995/08/21 09:11:16 quinn * Smallish fixes to suppport new formats. * * Revision 1.1 1995/05/29 08:17:13 quinn @@ -34,11 +103,15 @@ * entries to the list at initialization. */ +#include #include +#include static int z3950_prefix[] = { 1, 2, 840, 10003, -1 }; static int sr_prefix[] = { 1, 0, 10163, -1 }; +static oident *extoids = NULL; + /* * OID database */ @@ -50,15 +123,23 @@ static oident oids[] = /* Z39.50v3 definitions */ {PROTO_Z3950, CLASS_ABSYN, VAL_APDU, {2,1,-1}, "Z-APDU" }, + {PROTO_Z3950, CLASS_APPCTX, VAL_BASIC_CTX, {1,1,-1}, "Z-BASIC" }, + {PROTO_Z3950, CLASS_ATTSET, VAL_BIB1, {3,1,-1}, "Bib-1" }, {PROTO_Z3950, CLASS_ATTSET, VAL_EXP1, {3,2,-1}, "Exp-1" }, {PROTO_Z3950, CLASS_ATTSET, VAL_EXT1, {3,3,-1}, "Ext-1" }, {PROTO_Z3950, CLASS_ATTSET, VAL_CCL1, {3,4,-1}, "CCL-1" }, - {PROTO_Z3950, CLASS_ATTSET, VAL_GILS, {3,5,-1}, "GILS" }, - {PROTO_Z3950, CLASS_ATTSET, VAL_STAS, {3,6,-1}, "STAS", }, + {PROTO_Z3950, CLASS_ATTSET, VAL_GILS, {3,5,-1}, "GILS-attset" }, + {PROTO_Z3950, CLASS_ATTSET, VAL_STAS, {3,6,-1}, "STAS-attset" }, + {PROTO_Z3950, CLASS_ATTSET, VAL_COLLECT1, {3,7,-1}, "Collections-attset"}, + {PROTO_Z3950, CLASS_ATTSET, VAL_CIMI1, {3,8,-1}, "CIMI-attset"}, + {PROTO_Z3950, CLASS_ATTSET, VAL_GEO, {3,9,-1}, "Geo-attset"}, + {PROTO_Z3950, CLASS_ATTSET, VAL_THESAURUS, {3,1000,81,1,-1},"Thesaurus-attset"}, + {PROTO_Z3950, CLASS_DIAGSET, VAL_BIB1, {4,1,-1}, "Bib-1" }, {PROTO_Z3950, CLASS_DIAGSET, VAL_DIAG1, {4,2,-1}, "Diag-1" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_UNIMARC, {5,1,-1}, "Unimarc" }, {PROTO_Z3950, CLASS_RECSYN, VAL_INTERMARC, {5,2,-1}, "Intermarc" }, {PROTO_Z3950, CLASS_RECSYN, VAL_CCF, {5,3,-1}, "CCF" }, @@ -74,6 +155,8 @@ static oident oids[] = {PROTO_Z3950, CLASS_RECSYN, VAL_PICAMARC, {5,19,-1}, "Picamarc" }, {PROTO_Z3950, CLASS_RECSYN, VAL_AUSMARC, {5,20,-1}, "Ausmarc" }, {PROTO_Z3950, CLASS_RECSYN, VAL_IBERMARC, {5,21,-1}, "Ibermarc" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_CATMARC, {5,22,-1}, "Carmarc" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_MALMARC, {5,23,-1}, "Malmarc" }, {PROTO_Z3950, CLASS_RECSYN, VAL_EXPLAIN, {5,100,-1}, "Explain" }, {PROTO_Z3950, CLASS_RECSYN, VAL_SUTRS, {5,101,-1}, "SUTRS" }, {PROTO_Z3950, CLASS_RECSYN, VAL_OPAC, {5,102,-1}, "OPAC" }, @@ -81,11 +164,19 @@ 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" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_FRAGMENT, {5,107,-1}, "Fragment" }, +#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" }, {PROTO_Z3950, CLASS_ACCFORM, VAL_DES1, {8,2,-1}, "Des-1" }, {PROTO_Z3950, CLASS_ACCFORM, VAL_KRB1, {8,3,-1}, "Krb-1" }, + {PROTO_Z3950, CLASS_EXTSERV, VAL_PRESSET, {9,1,-1}, "Pers. set" }, {PROTO_Z3950, CLASS_EXTSERV, VAL_PQUERY, {9,2,-1}, "Pers. query" }, {PROTO_Z3950, CLASS_EXTSERV, VAL_PCQUERY, {9,3,-1}, "Per'd query" }, @@ -94,18 +185,45 @@ static oident oids[] = {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" }, + + {PROTO_Z3950, CLASS_SCHEMA, VAL_WAIS, {13,1,-1}, "WAIS-schema" }, + {PROTO_Z3950, CLASS_SCHEMA, VAL_GILS, {13,2,-1}, "GILS-schema" }, + {PROTO_Z3950, CLASS_SCHEMA, VAL_COLLECT1, {13,3,-1}, "Collections-schema" }, + {PROTO_Z3950, CLASS_SCHEMA, VAL_GEO, {13,4,-1}, "Geo-schema" }, + {PROTO_Z3950, CLASS_SCHEMA, VAL_CIMI1, {13,5,-1}, "CIMI-schema" }, + + {PROTO_Z3950, CLASS_TAGSET, VAL_SETM, {14,1,-1}, "TagsetM" }, + {PROTO_Z3950, CLASS_TAGSET, VAL_SETG, {14,2,-1}, "TagsetG" }, + {PROTO_Z3950, CLASS_TAGSET, VAL_STAS, {14,3,-1}, "STAS-tagset" }, + {PROTO_Z3950, CLASS_TAGSET, VAL_GILS, {14,4,-1}, "GILS-tagset" }, + {PROTO_Z3950, CLASS_TAGSET, VAL_COLLECT1, {14,5,-1}, "Collections-tagset"}, + {PROTO_Z3950, CLASS_TAGSET, VAL_CIMI1, {14,6,-1}, "CIMI-tagset" }, + {PROTO_Z3950, CLASS_TAGSET, VAL_THESAURUS, {14,1000,81,1,-1}, "thesaurus-tagset"}, + /* SR definitions. Note that some of them aren't defined by the - standard (yet), but are borrowed from Z3950v3 */ + standard (yet), but are borrowed from Z3950v3 */ {PROTO_SR, CLASS_ABSYN, VAL_APDU, {2,1,-1}, "SR-APDU" }, + {PROTO_SR, CLASS_APPCTX, VAL_BASIC_CTX, {1,1,-1}, "SR-BASIC" }, + {PROTO_SR, CLASS_ATTSET, VAL_BIB1, {3,1,-1}, "Bib-1" }, {PROTO_SR, CLASS_ATTSET, VAL_EXP1, {3,2,-1}, "Exp-1" }, {PROTO_SR, CLASS_ATTSET, VAL_EXT1, {3,3,-1}, "Ext-1" }, {PROTO_SR, CLASS_ATTSET, VAL_CCL1, {3,4,-1}, "CCL-1" }, {PROTO_SR, CLASS_ATTSET, VAL_GILS, {3,5,-1}, "GILS" }, {PROTO_SR, CLASS_ATTSET, VAL_STAS, {3,6,-1}, "STAS", }, + {PROTO_SR, CLASS_ATTSET, VAL_COLLECT1, {3,7,-1}, "Collections-attset"}, + {PROTO_SR, CLASS_ATTSET, VAL_CIMI1, {3,8,-1}, "CIMI-attset"}, + {PROTO_SR, CLASS_ATTSET, VAL_GEO, {3,9,-1}, "Geo-attset"}, + {PROTO_SR, CLASS_DIAGSET, VAL_BIB1, {4,1,-1}, "Bib-1" }, {PROTO_SR, CLASS_DIAGSET, VAL_DIAG1, {4,2,-1}, "Diag-1" }, + {PROTO_SR, CLASS_RECSYN, VAL_UNIMARC, {5,1,-1}, "Unimarc" }, {PROTO_SR, CLASS_RECSYN, VAL_INTERMARC, {5,2,-1}, "Intermarc" }, {PROTO_SR, CLASS_RECSYN, VAL_CCF, {5,3,-1}, "CCF" }, @@ -123,6 +241,8 @@ static oident oids[] = {PROTO_SR, CLASS_RECSYN, VAL_PICAMARC, {5,19,-1}, "Picamarc" }, {PROTO_SR, CLASS_RECSYN, VAL_AUSMARC, {5,20,-1}, "Ausmarc" }, {PROTO_SR, CLASS_RECSYN, VAL_IBERMARC, {5,21,-1}, "Ibermarc" }, + {PROTO_SR, CLASS_RECSYN, VAL_CATMARC, {5,22,-1}, "Catmarc" }, + {PROTO_SR, CLASS_RECSYN, VAL_MALMARC, {5,23,-1}, "Malmarc" }, {PROTO_SR, CLASS_RECSYN, VAL_EXPLAIN, {5,100,-1}, "Explain" }, {PROTO_SR, CLASS_RECSYN, VAL_SUTRS, {5,101,-1}, "SUTRS" }, {PROTO_SR, CLASS_RECSYN, VAL_OPAC, {5,102,-1}, "OPAC" }, @@ -130,11 +250,15 @@ static oident oids[] = {PROTO_SR, CLASS_RECSYN, VAL_GRS0, {5,104,-1}, "GRS-0" }, {PROTO_SR, CLASS_RECSYN, VAL_GRS1, {5,105,-1}, "GRS-1" }, {PROTO_SR, CLASS_RECSYN, VAL_EXTENDED, {5,106,-1}, "Extended" }, + {PROTO_SR, CLASS_RECSYN, VAL_FRAGMENT, {5,107,-1}, "Fragment" }, + {PROTO_SR, CLASS_RESFORM, VAL_RESOURCE1, {7,1,-1}, "Resource-1" }, {PROTO_SR, CLASS_RESFORM, VAL_RESOURCE2, {7,2,-1}, "Resource-2" }, + {PROTO_SR, CLASS_ACCFORM, VAL_PROMPT1, {8,1,-1}, "Prompt-1" }, {PROTO_SR, CLASS_ACCFORM, VAL_DES1, {8,2,-1}, "Des-1" }, {PROTO_SR, CLASS_ACCFORM, VAL_KRB1, {8,3,-1}, "Krb-1" }, + {PROTO_SR, CLASS_EXTSERV, VAL_PRESSET, {9,1,-1}, "Pers. set" }, {PROTO_SR, CLASS_EXTSERV, VAL_PQUERY, {9,2,-1}, "Pers. query" }, {PROTO_SR, CLASS_EXTSERV, VAL_PCQUERY, {9,3,-1}, "Per'd query" }, @@ -142,6 +266,26 @@ static oident oids[] = {PROTO_SR, CLASS_EXTSERV, VAL_DBUPDATE, {9,5,-1}, "DB. Update" }, {PROTO_SR, CLASS_EXTSERV, VAL_EXPORTSPEC,{9,6,-1}, "exp. spec." }, {PROTO_SR, CLASS_EXTSERV, VAL_EXPORTINV, {9,7,-1}, "exp. inv." }, + + {PROTO_SR, CLASS_ELEMSPEC,VAL_ESPEC1, {11,1,-1}, "Espec-1" }, + + {PROTO_SR, CLASS_VARSET, VAL_VAR1, {12,1,-1}, "Variant-1" }, + + {PROTO_SR, CLASS_SCHEMA, VAL_WAIS, {13,1,-1}, "WAIS-schema" }, + {PROTO_SR, CLASS_SCHEMA, VAL_GILS, {13,2,-1}, "GILS-schema" }, + {PROTO_SR, CLASS_SCHEMA, VAL_COLLECT1, {13,3,-1}, "Collections-schema" }, + {PROTO_SR, CLASS_SCHEMA, VAL_GEO, {13,4,-1}, "Geo-schema" }, + {PROTO_SR, CLASS_SCHEMA, VAL_CIMI1, {13,5,-1}, "CIMI-schema" }, + {PROTO_Z3950, CLASS_SCHEMA, VAL_THESAURUS, {13,1000,81,1,-1}, "thesaurus-schema"}, + + {PROTO_SR, CLASS_TAGSET, VAL_SETM, {14,1,-1}, "TagsetM" }, + {PROTO_SR, CLASS_TAGSET, VAL_SETG, {14,2,-1}, "TagsetG" }, + + {PROTO_SR, CLASS_TAGSET, VAL_STAS, {14,3,-1}, "STAS-tagset" }, + {PROTO_SR, CLASS_TAGSET, VAL_GILS, {14,4,-1}, "GILS-tagset" }, + {PROTO_SR, CLASS_TAGSET, VAL_COLLECT1, {14,5,-1}, "Collections-tagset"}, + {PROTO_SR, CLASS_TAGSET, VAL_CIMI1, {14,6,-1}, "CIMI-tagset" }, + {0, 0, 0, {-1}, 0 } }; @@ -155,7 +299,7 @@ void oid_oidcpy(int *t, int *s) void oid_oidcat(int *t, int *s) { while (*t > -1) - t++; + t++; while ((*(t++) = *(s++)) > -1); } @@ -163,15 +307,15 @@ int oid_oidcmp(int *o1, int *o2) { while (*o1 == *o2 && *o1 > -1) { - o1++; - o2++; + o1++; + o2++; } if (*o1 == *o2) - return 0; + return 0; else if (*o1 > *o2) - return 1; + return 1; else - return -1; + return -1; } int oid_oidlen(int *o) @@ -179,7 +323,7 @@ int oid_oidlen(int *o) int len = 0; while (*(o++) >= 0) - len++; + len++; return len; } @@ -190,7 +334,7 @@ static int match_prefix(int *look, int *prefix) for (len = 0; *look == *prefix; look++, prefix++, len++); if (*prefix < 0) /* did we reach the end of the prefix? */ - return len; + return len; return 0; } @@ -202,40 +346,87 @@ struct oident *oid_getentbyoid(int *o) /* determine protocol type */ if (!o) - return 0; - if ((prelen = match_prefix(o, z3950_prefix))) - proto = PROTO_Z3950; - else if ((prelen = match_prefix(o, sr_prefix))) - proto = PROTO_SR; + return 0; + if ((prelen = match_prefix(o, z3950_prefix)) != 0) + proto = PROTO_Z3950; + else if ((prelen = match_prefix(o, sr_prefix)) != 0) + proto = PROTO_SR; else - proto = PROTO_GENERAL; + proto = PROTO_GENERAL; for (p = oids; *p->oidsuffix >= 0; p++) - if (p->proto == proto && !oid_oidcmp(o + prelen, p->oidsuffix)) - return 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; } + /* * To query, fill out proto, class, and value of the ent parameter. */ -int *oid_getoidbyent(struct oident *ent) +int *oid_ent_to_oid(struct oident *ent, int *ret) { struct oident *p; - static int ret[OID_SIZE]; for (p = oids; *p->oidsuffix >= 0; p++) - if (ent->proto == p->proto && - ent->class == p->class && - 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; - } + 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; + } + 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; } +/* + * To query, fill out proto, class, and value of the ent parameter. + */ +int *oid_getoidbyent(struct oident *ent) +{ + static int ret[OID_SIZE]; + + return oid_ent_to_oid (ent, ret); +} + +oid_value oid_getvalbyname(const char *name) +{ + struct oident *p; + + for (p = oids; *p->oidsuffix >= 0; p++) + 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; +}