X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Foid.c;h=3e6a92644e62b2fd24c490fbb94311b9dc545dca;hb=b6e8efd1bc9032260c1f30418f505f17ed2f4472;hp=a65d0285dc93b98ec00beda1d3ddc375818f84cd;hpb=9c459af695605b44a044ad206562818be10034f1;p=yaz-moved-to-github.git diff --git a/util/oid.c b/util/oid.c index a65d028..3e6a926 100644 --- a/util/oid.c +++ b/util/oid.c @@ -4,7 +4,22 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: oid.c,v $ - * Revision 1.5 1995-09-29 17:01:51 quinn + * 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 @@ -64,8 +79,8 @@ static oident oids[] = {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_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" }, @@ -102,10 +117,17 @@ 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_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_TAGSET, VAL_SETM, {14,1,-1}, "TagsetM" }, {PROTO_Z3950, CLASS_TAGSET, VAL_SETG, {14,2,-1}, "TagsetG" }, - {PROTO_Z3950, CLASS_TAGSET, VAL_GILS, {14,3,-1}, "GILS" }, +#if 0 + {PROTO_Z3950, CLASS_TAGSET, VAL_GILS, {14,3,-1}, "GILS-tagset" }, +#endif /* SR definitions. Note that some of them aren't defined by the standard (yet), but are borrowed from Z3950v3 */ @@ -155,28 +177,36 @@ 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_TAGSET, VAL_SETM, {14,1,-1}, "TagsetM" }, {PROTO_SR, CLASS_TAGSET, VAL_SETG, {14,2,-1}, "TagsetG" }, +#if 0 + {PROTO_SR, CLASS_TAGSET, VAL_GILS, {14,3,-1}, "GILS-tagset" }, +#endif {0, 0, 0, {-1}, 0 } }; /* OID utilities */ -void MDF oid_oidcpy(int *t, int *s) +void oid_oidcpy(int *t, int *s) { while ((*(t++) = *(s++)) > -1); } -void MDF oid_oidcat(int *t, int *s) +void oid_oidcat(int *t, int *s) { while (*t > -1) t++; while ((*(t++) = *(s++)) > -1); } -int MDF oid_oidcmp(int *o1, int *o2) +int oid_oidcmp(int *o1, int *o2) { while (*o1 == *o2 && *o1 > -1) { @@ -191,7 +221,7 @@ int MDF oid_oidcmp(int *o1, int *o2) return -1; } -int MDF oid_oidlen(int *o) +int oid_oidlen(int *o) { int len = 0; @@ -211,7 +241,7 @@ static int match_prefix(int *look, int *prefix) return 0; } -struct oident MDF *oid_getentbyoid(int *o) +struct oident *oid_getentbyoid(int *o) { enum oid_proto proto; int prelen; @@ -235,7 +265,7 @@ struct oident MDF *oid_getentbyoid(int *o) /* * To query, fill out proto, class, and value of the ent parameter. */ -int MDF *oid_getoidbyent(struct oident *ent) +int *oid_getoidbyent(struct oident *ent) { struct oident *p; static int ret[OID_SIZE]; @@ -257,7 +287,7 @@ int MDF *oid_getoidbyent(struct oident *ent) return 0; } -oid_value MDF oid_getvalbyname(char *name) +oid_value oid_getvalbyname(char *name) { struct oident *p;