/*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: oid.c,v 1.55 2002-04-12 14:40:21 adam Exp $
+ * $Id: oid.c,v 1.68 2003-09-11 12:30:59 mike Exp $
*/
/*
"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"},
+ /* New applications should use Zthes-1 instead of this Satan-spawn */
+ {PROTO_Z3950, CLASS_ATTSET, VAL_THESAURUS, {3,1000,81,1,-1},
"Thesaurus-attset"},
{PROTO_Z3950, CLASS_ATTSET, VAL_IDXPATH, {3,1000,81,2,-1},
"IDXPATH"},
"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},
"exp. spec."},
{PROTO_Z3950, CLASS_EXTSERV, VAL_EXPORTINV, {9,7,-1},
"exp. inv."},
- {PROTO_Z3950, CLASS_EXTSERV, VAL_ADMINSERVICE, {9,81,1,-1},
+ {PROTO_Z3950, CLASS_EXTSERV, VAL_ADMINSERVICE, {9,1000,81,1,-1},
"Admin"},
{PROTO_Z3950, CLASS_USERINFO,VAL_SEARCHRES1, {10,1,-1},
"searchResult-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_NEGOT, VAL_ID_CHARSET, {15,1000,81,1,-1},
+ "ID-Charset" },
+ {PROTO_Z3950, CLASS_USERINFO,VAL_CQL, {16, 2, -1},
+ "CQL"},
{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},
"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},
+ "OCLC-userInfo"},
{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++;
}
}
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;
}
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);
+}
+