X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Foid.c;h=95c5846f7b3ca57e63c03e355252a05afcf52f8d;hp=6276424d1e083388ab30c0203bd9e2ed7ba83546;hb=0038ea56f28bf86ed4e70e6f076fed78ad5b96e1;hpb=febd96e724a673b84f5db8f48dfb71c805c7f5e6 diff --git a/util/oid.c b/util/oid.c index 6276424..95c5846 100644 --- a/util/oid.c +++ b/util/oid.c @@ -1,10 +1,23 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: oid.c,v $ - * Revision 1.32 1999-02-18 10:30:46 quinn + * Revision 1.36 1999-05-27 13:02:20 adam + * Assigned OID for old DB Update (VAL_DBUPDATE0). + * + * Revision 1.35 1999/04/20 09:56:49 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.34 1999/04/15 09:19:43 adam + * Added COOKIE UserInfo OID. + * + * Revision 1.33 1999/04/09 12:16:11 adam + * Added OtherInfo private OID proxy. + * + * Revision 1.32 1999/02/18 10:30:46 quinn * Changed ES: Update OID * * Revision 1.31 1998/12/03 11:33:05 adam @@ -153,118 +166,209 @@ static int oid_value_dynamic = VAL_DYNAMIC; static oident oids[] = { /* General definitions */ - {PROTO_GENERAL, CLASS_TRANSYN, VAL_BER, {2,1,1,-1}, "BER" }, - {PROTO_GENERAL, CLASS_TRANSYN, VAL_ISO2709, {1,0,2709,1,1,-1},"ISO2709"}, - + {PROTO_GENERAL, CLASS_TRANSYN, VAL_BER, {2,1,1,-1}, + "BER" }, + {PROTO_GENERAL, CLASS_TRANSYN, VAL_ISO2709, {1,0,2709,1,1,-1}, + "ISO2709"}, /* 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-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" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_USMARC, {5,10,-1}, "USmarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_UKMARC, {5,11,-1}, "UKmarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_NORMARC, {5,12,-1}, "Normarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_LIBRISMARC,{5,13,-1}, "Librismarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_DANMARC, {5,14,-1}, "Danmarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_FINMARC, {5,15,-1}, "Finmarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_MAB, {5,16,-1}, "MAB" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_CANMARC, {5,17,-1}, "Canmarc" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_SBN, {5,18,-1}, "SBN" }, - {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" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_SUMMARY, {5,103,-1}, "Summary" }, - {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" }, - - {PROTO_Z3950, CLASS_RECSYN, VAL_PDF, {5,109,1,-1},"pdf" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_POSTSCRIPT,{5,109,2,-1},"postscript" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_HTML, {5,109,3,-1},"html" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_TIFF, {5,109,4,-1},"tiff" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_GIF, {5,109,5,-1},"gif" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_JPEG, {5,109,6,-1},"jpeg" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_PNG, {5,109,7,-1},"png" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_MPEG, {5,109,8,-1},"mpeg" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_SGML, {5,109,9,-1},"sgml" }, - - {PROTO_Z3950, CLASS_RECSYN, VAL_TIFFB, {5,110,1,-1},"tiff-b" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_WAV, {5,110,2,-1},"wav" }, - - {PROTO_Z3950, CLASS_RECSYN, VAL_SQLRS, {5,111,-1}, "SQL-RS" }, + {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-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"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_USMARC, {5,10,-1}, + "USmarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_UKMARC, {5,11,-1}, + "UKmarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_NORMARC, {5,12,-1}, + "Normarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_LIBRISMARC, {5,13,-1}, + "Librismarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_DANMARC, {5,14,-1}, + "Danmarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_FINMARC, {5,15,-1}, + "Finmarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_MAB, {5,16,-1}, + "MAB"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_CANMARC, {5,17,-1}, + "Canmarc"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_SBN, {5,18,-1}, + "SBN"}, + {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"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_SUMMARY, {5,103,-1}, + "Summary"}, + {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"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_PDF, {5,109,1,-1}, + "pdf"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_POSTSCRIPT, {5,109,2,-1}, + "postscript"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_HTML, {5,109,3,-1}, + "html"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_TIFF, {5,109,4,-1}, + "tiff"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_GIF, {5,109,5,-1}, + "gif"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_JPEG, {5,109,6,-1}, + "jpeg"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_PNG, {5,109,7,-1}, + "png"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_MPEG, {5,109,8,-1}, + "mpeg"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_SGML, {5,109,9,-1}, + "sgml"}, + + {PROTO_Z3950, CLASS_RECSYN, VAL_TIFFB, {5,110,1,-1}, + "tiff-b"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_WAV, {5,110,2,-1}, + "wav"}, + + {PROTO_Z3950, CLASS_RECSYN, VAL_SQLRS, {5,111,-1}, + "SQL-RS"}, #if 0 - {PROTO_Z3950, CLASS_RECSYN, VAL_ID_SGML, {5,1000,81,1,-1},"ID-SGML" }, + {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_RECSYN, VAL_TEXT_XML, {5,109,10,-1}, "text-XML" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_TEXT_XML, {5,109,10,-1}, "XML" }, - {PROTO_Z3950, CLASS_RECSYN, VAL_APPLICATION_XML, - {5,109,11,-1}, "application-XML" }, - {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_RESFORM, VAL_UNIVERSE_REPORT, {7,1000,81,1,-1}, "UNIverse-Resource-Report"}, - - {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" }, - {PROTO_Z3950, CLASS_EXTSERV, VAL_ITEMORDER, {9,4,-1}, "Item order" }, - {PROTO_Z3950, CLASS_EXTSERV, VAL_DBUPDATE, {9,5,1,1,-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_USERINFO,VAL_CHARLANG, {10,2,-1}, "CharSetandLanguageNegotiation"}, - {PROTO_Z3950, CLASS_USERINFO,VAL_USERINFO1, {10,3,-1}, "UserInfo-1"}, - {PROTO_Z3950, CLASS_USERINFO,VAL_MULTISRCH1,{10,4,-1}, "MultipleSearchTerms-1"}, - {PROTO_Z3950, CLASS_USERINFO,VAL_MULTISRCH2,{10,5,-1}, "MultipleSearchTerms-2"}, - {PROTO_Z3950, CLASS_USERINFO,VAL_DATETIME, {10,6,-1}, "DateTime"}, - - {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_SCHEMA, VAL_UPDATEES, {13,6,-1}, "Update ES" }, - {PROTO_Z3950, CLASS_SCHEMA, VAL_THESAURUS, {13,1000,81,1,-1}, "thesaurus-schema"}, - {PROTO_Z3950, CLASS_SCHEMA, VAL_EXPLAIN, {13,1000,81,2,-1}, "Explain-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"}, - {PROTO_Z3950, CLASS_TAGSET, VAL_EXPLAIN, {14,1000,81,2,-1}, "Explain-tagset"}, + {PROTO_Z3950, CLASS_RECSYN, VAL_SOIF, {5,1000,81,2,-1}, + "SOIF" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_TEXT_XML, {5,109,10,-1}, + "text-XML" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_TEXT_XML, {5,109,10,-1}, + "XML" }, + {PROTO_Z3950, CLASS_RECSYN, VAL_APPLICATION_XML, {5,109,11,-1}, + "application-XML" }, + {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_RESFORM, VAL_UNIVERSE_REPORT, {7,1000,81,1,-1}, + "UNIverse-Resource-Report"}, + + {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"}, + {PROTO_Z3950, CLASS_EXTSERV, VAL_ITEMORDER, {9,4,-1}, + "Item order"}, + {PROTO_Z3950, CLASS_EXTSERV, VAL_DBUPDATE0, {9,5,1,-1}, + "DB. Update (old version)"}, + {PROTO_Z3950, CLASS_EXTSERV, VAL_DBUPDATE, {9,5,1,1,-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_USERINFO,VAL_CHARLANG, {10,2,-1}, + "CharSetandLanguageNegotiation"}, + {PROTO_Z3950, CLASS_USERINFO,VAL_USERINFO1, {10,3,-1}, + "UserInfo-1"}, + {PROTO_Z3950, CLASS_USERINFO,VAL_MULTISRCH1, {10,4,-1}, + "MultipleSearchTerms-1"}, + {PROTO_Z3950, CLASS_USERINFO,VAL_MULTISRCH2, {10,5,-1}, + "MultipleSearchTerms-2"}, + {PROTO_Z3950, CLASS_USERINFO,VAL_DATETIME, {10,6,-1}, + "DateTime"}, + {PROTO_Z3950, CLASS_USERINFO,VAL_PROXY, {10,1000,81,1,-1}, + "Proxy" }, + {PROTO_Z3950, CLASS_USERINFO,VAL_COOKIE, {10,1000,81,2,-1}, + "Cookie" }, + {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_SCHEMA, VAL_UPDATEES, {13,6,-1}, + "Update ES"}, + {PROTO_Z3950, CLASS_SCHEMA, VAL_THESAURUS, {13,1000,81,1,-1}, + "thesaurus-schema"}, + {PROTO_Z3950, CLASS_SCHEMA, VAL_EXPLAIN, {13,1000,81,2,-1}, + "Explain-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"}, + {PROTO_Z3950, CLASS_TAGSET, VAL_EXPLAIN, {14,1000,81,2,-1}, + "Explain-tagset"}, /* SR definitions. Note that some of them aren't defined by the @@ -485,7 +589,8 @@ int *oid_getoidbyent(struct oident *ent) return oid_ent_to_oid (ent, ret); } -struct oident *oid_addent (int *oid, int proto, int oclass, +struct oident *oid_addent (int *oid, enum oid_proto proto, + enum oid_class oclass, const char *desc, int value) { struct oident *oident; @@ -513,9 +618,9 @@ struct oident *oid_addent (int *oid, int proto, int oclass, oident->desc = (char *) malloc (strlen(desc)+1); strcpy (oident->desc, desc); if (value == VAL_DYNAMIC) - oident->value = ++oid_value_dynamic; + oident->value = (enum oid_value) (++oid_value_dynamic); else - oident->value = value; + oident->value = (enum oid_value) value; oid_oidcpy (oident->oidsuffix, oid); oident_list->next = oident_table; oident_table = oident_list;