/*
- * Copyright (c) 1995-2001, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
- * $Log: oid.c,v $
- * Revision 1.49 2001-10-24 20:11:46 adam
- * Removed SR OID's.
- *
- * Revision 1.48 2001/09/27 12:09:18 adam
- * Function nmem_exit calls oid_exit (when reference is 0).
- *
- * Revision 1.47 2001/09/24 21:51:55 adam
- * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid
- * and yaz_z3950oid_to_str.
- *
- * 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
- * Added Admin Extended Service OID
- *
- * Revision 1.42 2000/02/29 13:44:55 adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.41 2000/01/10 15:16:53 adam
- * Added several OID's.
- *
- * Revision 1.40 2000/01/06 14:59:13 adam
- * Added oid_init/oid_exit. Changed oid_exit.
- *
- * Revision 1.39 1999/12/16 23:36:19 adam
- * Implemented ILL protocol. Minor updates ASN.1 compiler.
- *
- * Revision 1.38 1999/11/30 13:47:12 adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.37 1999/09/13 12:51:15 adam
- * Added CLIENT IP OID.
- *
- * 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
- * Added OID's for XML.
- *
- * Revision 1.30 1998/10/18 07:48:56 adam
- * Fixed oid_getentbyoid so that it returns NULL when parsed oid is NULL.
- *
- * Revision 1.29 1998/10/14 13:32:35 adam
- * Added include of string.h.
- *
- * Revision 1.28 1998/10/13 16:01:53 adam
- * Implemented support for dynamic object identifiers.
- * Function oid_getvalbyname now accepts raw OID's as well as traditional
- * names.
- *
- * Revision 1.27 1998/05/18 10:10:02 adam
- * Added Explain-schema and Explain-tagset to OID database.
- *
- * Revision 1.26 1998/03/20 14:46:06 adam
- * Added UNIverse Resource Reports.
- *
- * Revision 1.25 1998/02/10 15:32:03 adam
- * Added new Object Identifiers.
- *
- * 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
- * iMoved oid to util to support comstack.
- *
- * Revision 1.5 1995/05/22 11:30:16 quinn
- * Adding Z39.50-1992 stuff to proto.c. Adding zget.c
- *
- * Revision 1.4 1995/05/16 08:50:22 quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.3 1995/04/11 11:52:02 quinn
- * Fixed possible buf in proto.c
- *
- * Revision 1.2 1995/03/29 15:39:38 quinn
- * Adding some resource control elements, and a null-check to getentbyoid
- *
- * Revision 1.1 1995/03/27 08:32:12 quinn
- * Added OID database
- *
- *
+ * $Id: oid.c,v 1.64 2003-07-18 19:54:30 mike Exp $
*/
/*
"BER" },
{PROTO_GENERAL, CLASS_TRANSYN, VAL_ISO2709, {1,0,2709,1,1,-1},
"ISO2709"},
- {PROTO_GENERAL, CLASS_GENERAL, VAL_ISO_ILL_1, {1,2,10161,2,1,-1},
+ {PROTO_GENERAL, CLASS_GENERAL, VAL_ISO_ILL_1, {1,0,10161,2,1,-1},
"ISOILL-1"},
/* Z39.50v3 definitions */
{PROTO_Z3950, CLASS_ABSYN, VAL_APDU, {2,1,-1},
"CCL-1"},
{PROTO_Z3950, CLASS_ATTSET, VAL_GILS, {3,5,-1},
"GILS-attset"},
+ {PROTO_Z3950, CLASS_ATTSET, VAL_GILS, {3,5,-1},
+ "GILS"},
{PROTO_Z3950, CLASS_ATTSET, VAL_STAS, {3,6,-1},
"STAS-attset"},
{PROTO_Z3950, CLASS_ATTSET, VAL_COLLECT1, {3,7,-1},
"Dan-1"},
{PROTO_Z3950, CLASS_ATTSET, VAL_HOLDINGS, {3,16,-1},
"Holdings"},
-
- {PROTO_Z3950, CLASS_ATTSET, VAL_THESAURUS, {3,1000,81,1,-1},
+ {PROTO_Z3950, CLASS_ATTSET, VAL_USMARC, {3,17,-1},
+ "MARC"},
+ {PROTO_Z3950, CLASS_ATTSET, VAL_BIB2, {3,18,-1},
+ "Bib-2"},
+ {PROTO_Z3950, CLASS_ATTSET, VAL_ZEEREX, {3,19,-1},
+ "ZeeRex"},
+#if 0 /* This is the spawn of Satan. Use Zthes-1 instead */
+ {PROTO_Z3950, CLASS_ATTSET, VAL_THESAURUS, {3,1000,81,1,-1},
"Thesaurus-attset"},
+#endif /*0*/
+ {PROTO_Z3950, CLASS_ATTSET, VAL_IDXPATH, {3,1000,81,2,-1},
+ "IDXPATH"},
{PROTO_Z3950, CLASS_DIAGSET, VAL_BIB1, {4,1,-1},
"Bib-1"},
{PROTO_Z3950, CLASS_DIAGSET, VAL_DIAG1, {4,2,-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_DBUPDATE0, {9,5,-1},
+ "DB. Update (first version)"},
+ {PROTO_Z3950, CLASS_EXTSERV, VAL_DBUPDATE1, {9,5,1,-1},
+ "DB. Update (second version)"},
{PROTO_Z3950, CLASS_EXTSERV, VAL_DBUPDATE, {9,5,1,1,-1},
"DB. Update"},
{PROTO_Z3950, CLASS_EXTSERV, VAL_EXPORTSPEC, {9,6,-1},
{PROTO_Z3950, CLASS_TAGSET, VAL_CIMI1, {14,6,-1},
"CIMI-tagset"},
{PROTO_Z3950, CLASS_TAGSET, VAL_THESAURUS, {14,1000,81,1,-1},
- "thesaurus-tagset"},
+ "thesaurus-tagset"}, /* What is this Satan-spawn doing here? */
{PROTO_Z3950, CLASS_TAGSET, VAL_EXPLAIN, {14,1000,81,2,-1},
"Explain-tagset"},
+ {PROTO_Z3950, CLASS_TAGSET, VAL_ZTHES, {14,8,-1},
+ "Zthes-tagset"},
+ {PROTO_Z3950, CLASS_NEGOT, VAL_CHARNEG3, {15,3,-1},
+ "CharSetandLanguageNegotiation-3"},
+ {PROTO_Z3950, CLASS_USERINFO,VAL_CQL, {16, 2, -1},
+ "OCLC-userInfo"},
+ {PROTO_GENERAL, CLASS_GENERAL, VAL_UCS2, {1,0,10646,1,0,2,-1},
+ "UCS-2"},
+ {PROTO_GENERAL, CLASS_GENERAL, VAL_UCS4, {1,0,10646,1,0,4,-1},
+ "UCS-4"},
+ {PROTO_GENERAL, CLASS_GENERAL, VAL_UTF16, {1,0,10646,1,0,5,-1},
+ "UTF-16"},
+ {PROTO_GENERAL, CLASS_GENERAL, VAL_UTF8, {1,0,10646,1,0,8,-1},
+ "UTF-8"},
+ {PROTO_Z3950, CLASS_USERINFO,VAL_OCLCUI, {10, 1000, 17, 1, -1},
+ "CQL"},
{PROTO_NOP, CLASS_NOP, VAL_NOP, {-1}, 0 }
};
return 0;
}
-void oid_transfer (struct oident *oident)
+void oid_transfer (struct oident *oidentp)
{
- while (*oident->oidsuffix >= 0)
+ while (*oidentp->oidsuffix >= 0)
{
- oid_addent (oident->oidsuffix, oident->proto,
- oident->oclass,
- oident->desc, oident->value);
- oident++;
+ oid_addent (oidentp->oidsuffix, oidentp->proto,
+ oidentp->oclass,
+ oidentp->desc, oidentp->value);
+ oidentp++;
}
}
enum oid_class oclass,
const char *desc, int value)
{
- struct oident *oident;
+ struct oident *oident = 0;
nmem_mutex_enter (oid_mutex);
- oident = oid_getentbyoid_x (oid);
if (!oident)
{
char desc_str[200];
int i;
sprintf (desc_str, "%d", *oid);
- for (i = 1; oid[i] >= 0; i++)
+ for (i = 1; i < 12 && oid[i] >= 0; i++)
sprintf (desc_str+strlen(desc_str), ".%d", oid[i]);
desc = desc_str;
}
}
oid[i] = val;
oid[i+1] = -1;
- oident = oid_addent (oid, PROTO_GENERAL, CLASS_GENERAL, NULL,
+ oident = oid_getentbyoid_x (oid);
+ if (!oident)
+ oident = oid_addent (oid, PROTO_GENERAL, CLASS_GENERAL, NULL,
VAL_DYNAMIC);
return oident->value;
}
{
oid_transfer (list);
}
+
+void oid_trav (void (*func)(struct oident *oidinfo, void *vp), void *vp)
+{
+ struct oident_list *ol;
+
+ oid_init ();
+ for (ol = oident_table; ol; ol = ol->next)
+ (*func)(&ol->oident, vp);
+}
+
+int *oid_name_to_oid(oid_class oclass, const char *name, int *oid) {
+ struct oident ent;
+
+ /* Translate syntax to oid_val */
+ oid_value value = oid_getvalbyname(name);
+
+ /* Build it into an oident */
+ ent.proto = PROTO_Z3950;
+ ent.oclass = oclass;
+ ent.value = value;
+
+ /* Translate to an array of int */
+ return oid_ent_to_oid(&ent, oid);
+}
+
+char *oid_to_dotstring(const int *oid, char *oidbuf) {
+ char tmpbuf[20];
+ int i;
+
+ oidbuf[0] = '\0';
+ for (i = 0; oid[i] != -1; i++) {
+ sprintf(tmpbuf, "%d", oid[i]);
+ if (i > 0) strcat(oidbuf, ".");
+ strcat(oidbuf, tmpbuf);
+ }
+
+ return oidbuf;
+}
+
+char *oid_name_to_dotstring(oid_class oclass, const char *name, char *oidbuf) {
+ int oid[OID_SIZE];
+
+ (void) oid_name_to_oid(oclass, name, oid);
+ return oid_to_dotstring(oid, oidbuf);
+}
+
projects / yaz-moved-to-github.git / blobdiff