* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.66 1997-09-05 15:26:44 adam
+ * Revision 1.68 1997-09-29 13:18:59 adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.67 1997/09/17 12:10:40 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.66 1997/09/05 15:26:44 adam
* Added ODR encode in search and scen bend request structures.
* Fixed a few enums that caused trouble with C++.
*
if (req->implementationVersion)
logf(LOG_LOG, "Version: %s", req->implementationVersion);
+ binitreq.stream = assoc->encode;
binitreq.configname = "default-config";
binitreq.auth = req->idAuthentication;
if (!(binitres = bend_init(&binitreq)))
*/
static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
+ int oid[OID_SIZE];
Z_Records *rec = odr_malloc (assoc->encode, sizeof(*rec));
oident bib1;
int *err = odr_malloc (assoc->encode, sizeof(*err));
#else
rec->u.nonSurrogateDiagnostic = dr;
#endif
- dr->diagnosticSetId = oid_getoidbyent(&bib1);
+ dr->diagnosticSetId = oid_ent_to_oid(&bib1, oid);
dr->condition = err;
dr->which = Z_DiagForm_v2AddInfo;
dr->addinfo = addinfo ? addinfo : "";
static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname,
int error, char *addinfo)
{
+ int oid[OID_SIZE];
Z_NamePlusRecord *rec = odr_malloc (assoc->encode, sizeof(*rec));
int *err = odr_malloc (assoc->encode, sizeof(*err));
oident bib1;
rec->u.surrogateDiagnostic = drec;
drec->which = Z_DiagRec_defaultFormat;
drec->u.defaultFormat = dr;
- dr->diagnosticSetId = oid_getoidbyent(&bib1);
+ dr->diagnosticSetId = oid_ent_to_oid(&bib1, oid);
dr->condition = err;
dr->which = Z_DiagForm_v2AddInfo;
dr->addinfo = addinfo ? addinfo : "";
*/
static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo)
{
+ int oid[OID_SIZE];
Z_DiagRecs *recs = odr_malloc (assoc->encode, sizeof(*recs));
int *err = odr_malloc (assoc->encode, sizeof(*err));
oident bib1;
drec->which = Z_DiagRec_defaultFormat;
drec->u.defaultFormat = rec;
- rec->diagnosticSetId = oid_getoidbyent(&bib1);
+ rec->diagnosticSetId = oid_ent_to_oid(&bib1, oid);
rec->condition = err;
rec->which = Z_DiagForm_v2AddInfo;
rec->addinfo = addinfo ? addinfo : "";
int *num, Z_RecordComposition *comp,
int *next, int *pres, oid_value format)
{
+ int oid[OID_SIZE];
int recno, total_length = 0, toget = *num, dumped_records = 0;
Z_Records *records = odr_malloc (a->encode, sizeof(*records));
Z_NamePlusRecordList *reclist = odr_malloc (a->encode, sizeof(*reclist));
recform.oclass = CLASS_RECSYN;
recform.value = fres->format;
thisext->direct_reference = odr_oiddup(a->encode,
- oid_getoidbyent(&recform));
+ oid_ent_to_oid(&recform, oid));
thisext->indirect_reference = 0;
thisext->descriptor = 0;
if (fres->len < 0) /* Structured data */