From f4771de7a6ae21a45aff71b056a889608c945c31 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 3 Jan 1996 08:58:12 +0000 Subject: [PATCH] Updated to use new version of Yaz (some names changed to avoid C++ conflict). --- zlayer-yaz/zaccess.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/zlayer-yaz/zaccess.c b/zlayer-yaz/zaccess.c index ad64506..8d07fa6 100644 --- a/zlayer-yaz/zaccess.c +++ b/zlayer-yaz/zaccess.c @@ -47,7 +47,10 @@ * Z39.50 API for the Email gateway - YAZ version * * $Log: zaccess.c,v $ - * Revision 1.4 1995/07/28 10:51:34 adam + * Revision 1.5 1996/01/03 08:58:12 adam + * Updated to use new version of Yaz (some names changed to avoid C++ conflict). + * + * Revision 1.4 1995/07/28 10:51:34 adam * Bug fix: multiple databases weren't specified correctly. * * Revision 1.3 1995/07/20 08:18:15 adam @@ -375,9 +378,9 @@ static Z_RPNStructure *rpn2rpn(ODR o, struct ccl_rpn_node *q) if (!(r->u.complex->s1 = rpn2rpn(o, q->u.p[0])) || !(r->u.complex->s2 = rpn2rpn(o, q->u.p[1]))) return 0; - r->u.complex->operator = odr_malloc(o, sizeof(Z_Operator)); - r->u.complex->operator->which = op[q->kind]; - r->u.complex->operator->u.and = ""; + r->u.complex->roperator = odr_malloc(o, sizeof(Z_Operator)); + r->u.complex->roperator->which = op[q->kind]; + r->u.complex->roperator->u.and = ""; return r; default: gw_log(GW_LOG_FATAL, ZASS_TYPE, "Bad operator in RPN"); @@ -418,7 +421,7 @@ const struct zass_searchent *zass_searchresult(ZASS a, int *complete) if (dr->which != Z_DiagRec_defaultFormat || !(id = oid_getentbyoid (dr->u.defaultFormat->diagnosticSetId)) || - id->class != CLASS_DIAGSET || + id->oclass != CLASS_DIAGSET || id->value != VAL_BIB1) gw_log(GW_LOG_WARN, ZASS_TYPE, "Missing or unknown diagset - ignoring error!"); @@ -500,7 +503,7 @@ const struct zass_searchent *zass_search(ZASS a, struct ccl_rpn_node *query, q.which = Z_Query_type_1; q.u.type_1 = &rpnq; bib1.proto = PROTO_Z3950; - bib1.class = CLASS_ATTSET; + bib1.oclass = CLASS_ATTSET; bib1.value = VAL_BIB1; rpnq.attributeSetId = oid_getoidbyent(&bib1); @@ -574,7 +577,7 @@ void get_responserecords(zass_record ***p, Z_NamePlusRecordList *recs) (**p)->next = 0; if (!(recform = oid_getentbyoid(r->direct_reference)) || - recform->class != CLASS_RECSYN) + recform->oclass != CLASS_RECSYN) { gw_log(GW_LOG_WARN, ZASS_TYPE, "Unknown or bad record syntax"); (**p)->which = ZASS_REC_UNKNOWN; -- 1.7.10.4