- * Revision 1.43 2000-03-14 09:21:08 ian
+ * Revision 1.46 2001-06-26 14:11:27 adam
+ * Added MUTEX functions for NMEM module (used by OID utility).
+ *
+ * Revision 1.45 2001/05/16 07:25:59 adam
+ * Modified oid_ent_to_oid so that if proto is general, then class
+ * is ignored (only oid value is compared).
+ *
+ * Revision 1.44 2000/10/02 13:58:50 adam
+ * Added some OID's.
+ *
+ * Revision 1.43 2000/03/14 09:21:08 ian
static struct oident_list *oident_table = NULL;
static int oid_value_dynamic = VAL_DYNAMIC;
static int oid_init_flag = 0;
static struct oident_list *oident_table = NULL;
static int oid_value_dynamic = VAL_DYNAMIC;
static int oid_init_flag = 0;
{
/* General definitions */
{PROTO_GENERAL, CLASS_TRANSYN, VAL_BER, {2,1,1,-1},
{
/* General definitions */
{PROTO_GENERAL, CLASS_TRANSYN, VAL_BER, {2,1,1,-1},
"Fin-1"},
{PROTO_Z3950, CLASS_ATTSET, VAL_DAN1, {3,15,-1},
"Dan-1"},
"Fin-1"},
{PROTO_Z3950, CLASS_ATTSET, VAL_DAN1, {3,15,-1},
"Dan-1"},
{PROTO_Z3950, CLASS_ATTSET, VAL_THESAURUS, {3,1000,81,1,-1},
"Thesaurus-attset"},
{PROTO_Z3950, CLASS_ATTSET, VAL_THESAURUS, {3,1000,81,1,-1},
"Thesaurus-attset"},
"ISDSmarc"},
{PROTO_Z3950, CLASS_RECSYN, VAL_RUSMARC, {5,28,-1},
"RUSmarc"},
"ISDSmarc"},
{PROTO_Z3950, CLASS_RECSYN, VAL_RUSMARC, {5,28,-1},
"RUSmarc"},
{PROTO_Z3950, CLASS_RECSYN, VAL_EXPLAIN, {5,100,-1},
"Explain"},
{PROTO_Z3950, CLASS_RECSYN, VAL_SUTRS, {5,101,-1},
{PROTO_Z3950, CLASS_RECSYN, VAL_EXPLAIN, {5,100,-1},
"Explain"},
{PROTO_Z3950, CLASS_RECSYN, VAL_SUTRS, {5,101,-1},
"CIMI-schema"},
{PROTO_Z3950, CLASS_SCHEMA, VAL_UPDATEES, {13,6,-1},
"Update ES"},
"CIMI-schema"},
{PROTO_Z3950, CLASS_SCHEMA, VAL_UPDATEES, {13,6,-1},
"Update ES"},
+ {PROTO_Z3950, CLASS_SCHEMA, VAL_HOLDINGS, {13,7,-1},
+ "Holdings"},
+ {PROTO_Z3950, CLASS_SCHEMA, VAL_ZTHES, {13,8,-1},
+ "Zthes"},
{PROTO_Z3950, CLASS_SCHEMA, VAL_THESAURUS, {13,1000,81,1,-1},
"thesaurus-schema"},
{PROTO_Z3950, CLASS_SCHEMA, VAL_EXPLAIN, {13,1000,81,2,-1},
{PROTO_Z3950, CLASS_SCHEMA, VAL_THESAURUS, {13,1000,81,1,-1},
"thesaurus-schema"},
{PROTO_Z3950, CLASS_SCHEMA, VAL_EXPLAIN, {13,1000,81,2,-1},
no thread may exit oid_init before all OID's bave been
transferred - which is why checked is set after oid_transfer...
*/
no thread may exit oid_init before all OID's bave been
transferred - which is why checked is set after oid_transfer...
*/
+ nmem_mutex_create (&oid_mutex);
+ nmem_mutex_enter (oid_mutex);
+ if (!oid_nmem)
+ oid_nmem = nmem_create ();
+ nmem_mutex_leave (oid_mutex);
+ oid_transfer (standard_oids);
- if ((ent->proto == p->proto || p->proto == PROTO_GENERAL) &&
- (ent->oclass == p->oclass || p->oclass == CLASS_GENERAL) &&
- ent->value == p->value)
+ if (ent->value == p->value &&
+ (p->proto == PROTO_GENERAL || (ent->proto == p->proto &&
+ (ent->oclass == p->oclass || ent->oclass == CLASS_GENERAL))))
{
if (p->proto == PROTO_Z3950)
oid_oidcpy(ret, z3950_prefix);
{
if (p->proto == PROTO_Z3950)
oid_oidcpy(ret, z3950_prefix);