X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=31ef8661e23d3561cb6d871091af502d8dbeb656;hp=b420bbc8f8c6251245764161333912411014aa95;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hpb=09127934b3646ba7d5bc0a853b693792d64d3bac diff --git a/server/seshigh.c b/server/seshigh.c index b420bbc..31ef866 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,32 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.61 1996-06-10 08:56:16 quinn + * 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++. + * + * Revision 1.65 1997/09/01 08:53:01 adam + * New windows NT/95 port using MSV5.0. The test server 'ztest' was + * moved a separate directory. MSV5.0 project server.dsp created. + * As an option, the server can now operate as an NT service. + * + * Revision 1.64 1997/04/30 08:52:11 quinn + * Null + * + * Revision 1.63 1996/10/11 11:57:26 quinn + * Smallish + * + * Revision 1.62 1996/07/06 19:58:35 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.61 1996/06/10 08:56:16 quinn * Work on Summary. * * Revision 1.60 1996/05/30 11:03:10 quinn @@ -217,16 +242,20 @@ * */ +#include #include #include +#ifdef WINDOWS +#include +#else #include +#endif #include -#include #include #include -#include -#include +#include "eventl.h" +#include "session.h" #include #include #include @@ -333,14 +362,16 @@ void destroy_association(association *h) bend_close(h->backend); while (request_deq(&h->incoming)); while (request_deq(&h->outgoing)); - xfree(h); + request_delq(&h->incoming); + request_delq(&h->outgoing); + xfree(h); } static void do_close(association *a, int reason, char *message) { Z_APDU apdu; Z_Close *cls = zget_Close(a->encode); - request *req = request_get(); + request *req = request_get(&a->outgoing); /* Purge request queue */ while (request_deq(&a->incoming)); @@ -428,13 +459,13 @@ void ir_session(IOCHAN h, int event) /* we got a complete PDU. Let's decode it */ logf(LOG_DEBUG, "Got PDU, %d bytes", res); - req = request_get(); /* get a new request structure */ + req = request_get(&assoc->incoming); /* get a new request structure */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_APDU(assoc->decode, &req->request, 0)) { logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", - odr_errlist[odr_geterror(assoc->decode)], + odr_errmsg(odr_geterror(assoc->decode)), odr_offset(assoc->decode)); logf(LOG_LOG, "PDU dump:"); odr_dumpBER(log_file(), assoc->input_buffer, res); @@ -445,7 +476,7 @@ void ir_session(IOCHAN h, int event) if (assoc->print && !z_APDU(assoc->print, &req->request, 0)) { logf(LOG_WARN, "ODR print error: %s", - odr_errlist[odr_geterror(assoc->print)]); + odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } request_enq(&assoc->incoming, req); @@ -593,7 +624,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) if (!z_APDU(assoc->encode, &res, 0)) { logf(LOG_WARN, "ODR error when encoding response: %s", - odr_errlist[odr_geterror(assoc->decode)]); + odr_errmsg(odr_geterror(assoc->decode))); odr_reset(assoc->encode); return -1; } @@ -604,7 +635,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) if (assoc->print && !z_APDU(assoc->print, &res, 0)) { logf(LOG_WARN, "ODR print error: %s", - odr_errlist[odr_geterror(assoc->print)]); + odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } /* change this when we make the backend reentrant */ @@ -646,6 +677,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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))) @@ -734,131 +766,115 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) /* * nonsurrogate diagnostic record. */ -static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) +static Z_Records *diagrec(association *assoc, int error, char *addinfo) { - static Z_Records rec; + int oid[OID_SIZE]; + Z_Records *rec = odr_malloc (assoc->encode, sizeof(*rec)); oident bib1; - static int err; -#ifdef Z_95 - static Z_DiagRec drec; - static Z_DefaultDiagFormat dr; -#else - static Z_DiagRec dr; -#endif + int *err = odr_malloc (assoc->encode, sizeof(*err)); + Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr)); - bib1.proto = proto; + bib1.proto = assoc->proto; bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : "NULL"); - err = error; - rec.which = Z_Records_NSD; + *err = error; + rec->which = Z_Records_NSD; #ifdef Z_95 - rec.u.nonSurrogateDiagnostic = &drec; - drec.which = Z_DiagRec_defaultFormat; - drec.u.defaultFormat = &dr; + rec->u.nonSurrogateDiagnostic = drec; + drec->which = Z_DiagRec_defaultFormat; + drec->u.defaultFormat = dr; #else - rec.u.nonSurrogateDiagnostic = &dr; + rec->u.nonSurrogateDiagnostic = dr; #endif - dr.diagnosticSetId = oid_getoidbyent(&bib1); - dr.condition = &err; - dr.which = Z_DiagForm_v2AddInfo; - dr.addinfo = addinfo ? addinfo : ""; - return &rec; + dr->diagnosticSetId = oid_ent_to_oid(&bib1, oid); + dr->condition = err; + dr->which = Z_DiagForm_v2AddInfo; + dr->addinfo = addinfo ? addinfo : ""; + return rec; } /* * surrogate diagnostic. */ -static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, +static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, int error, char *addinfo) { - static Z_NamePlusRecord rec; - static int err; + int oid[OID_SIZE]; + Z_NamePlusRecord *rec = odr_malloc (assoc->encode, sizeof(*rec)); + int *err = odr_malloc (assoc->encode, sizeof(*err)); oident bib1; -#ifdef Z_95 - static Z_DiagRec drec; - static Z_DefaultDiagFormat dr; -#else - static Z_DiagRec dr; -#endif + Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr)); - bib1.proto = proto; + bib1.proto = assoc->proto; bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); - err = error; - rec.databaseName = dbname; - rec.which = Z_NamePlusRecord_surrogateDiagnostic; -#ifdef Z_95 - rec.u.surrogateDiagnostic = &drec; - drec.which = Z_DiagRec_defaultFormat; - drec.u.defaultFormat = &dr; -#else - rec.u.surrogateDiagnostic = &dr; -#endif - dr.diagnosticSetId = oid_getoidbyent(&bib1); - dr.condition = &err; - dr.which = Z_DiagForm_v2AddInfo; - dr.addinfo = addinfo ? addinfo : ""; - return &rec; + *err = error; + rec->databaseName = dbname; + rec->which = Z_NamePlusRecord_surrogateDiagnostic; + rec->u.surrogateDiagnostic = drec; + drec->which = Z_DiagRec_defaultFormat; + drec->u.defaultFormat = dr; + dr->diagnosticSetId = oid_ent_to_oid(&bib1, oid); + dr->condition = err; + dr->which = Z_DiagForm_v2AddInfo; + dr->addinfo = addinfo ? addinfo : ""; + return rec; } /* * multiple nonsurrogate diagnostics. */ -static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) +static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) { - static Z_DiagRecs recs; - static int err; + int oid[OID_SIZE]; + Z_DiagRecs *recs = odr_malloc (assoc->encode, sizeof(*recs)); + int *err = odr_malloc (assoc->encode, sizeof(*err)); oident bib1; -#ifdef Z_95 - static Z_DiagRec *recp[1], drec; - static Z_DefaultDiagFormat rec; -#else - static Z_DiagRec *recp[1], rec; -#endif + Z_DiagRec **recp = odr_malloc (assoc->encode, sizeof(*recp)); + Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *rec = odr_malloc (assoc->encode, sizeof(*rec)); logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo); - bib1.proto = proto; + bib1.proto = assoc->proto; bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; - err = error; - recs.num_diagRecs = 1; - recs.diagRecs = recp; -#ifdef Z_95 - recp[0] = &drec; - drec.which = Z_DiagRec_defaultFormat; - drec.u.defaultFormat = &rec; -#else - recp[0] = &rec; -#endif - rec.diagnosticSetId = oid_getoidbyent(&bib1); - rec.condition = &err; - rec.which = Z_DiagForm_v2AddInfo; - rec.addinfo = addinfo ? addinfo : ""; - return &recs; + *err = error; + recs->num_diagRecs = 1; + recs->diagRecs = recp; + recp[0] = drec; + drec->which = Z_DiagRec_defaultFormat; + drec->u.defaultFormat = rec; + + rec->diagnosticSetId = oid_ent_to_oid(&bib1, oid); + rec->condition = err; + rec->which = Z_DiagForm_v2AddInfo; + rec->addinfo = addinfo ? addinfo : ""; + return recs; } -#define MAX_RECORDS 256 - static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_RecordComposition *comp, int *next, int *pres, oid_value format) { - int recno, total_length = 0, toget = *num; - static Z_Records records; - static Z_NamePlusRecordList reclist; - static Z_NamePlusRecord *list[MAX_RECORDS]; + 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)); + Z_NamePlusRecord **list = odr_malloc (a->encode, sizeof(*list) * toget); oident recform; - records.which = Z_Records_DBOSD; - records.u.databaseOrSurDiagnostics = &reclist; - reclist.num_records = 0; - reclist.records = list; + records->which = Z_Records_DBOSD; + records->u.databaseOrSurDiagnostics = reclist; + reclist->num_records = 0; + reclist->records = list; *pres = Z_PRES_SUCCESS; *num = 0; *next = 0; @@ -866,7 +882,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, logf(LOG_DEBUG, "Request to pack %d+%d", start, toget); logf(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize, a->maximumRecordSize); - for (recno = start; reclist.num_records < toget; recno++) + for (recno = start; reclist->num_records < toget; recno++) { bend_fetchrequest freq; bend_fetchresult *fres; @@ -879,12 +895,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, * allocation done by the backend - this should give us a reasonable * idea of the total size of the data so far. */ - total_length = odr_total(a->encode); - if (reclist.num_records == MAX_RECORDS - 1) - { - *pres = Z_PRES_PARTIAL_2; - break; - } + total_length = odr_total(a->encode) - dumped_records; freq.setname = setname; freq.number = recno; freq.comp = comp; @@ -893,14 +904,14 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(fres = bend_fetch(a->backend, &freq, 0))) { *pres = Z_PRES_FAILURE; - return diagrec(a->proto, 2, "Backend interface problem"); + return diagrec(a, 2, "Backend interface problem"); } /* backend should be able to signal whether error is system-wide or only pertaining to current record */ if (fres->errcode) { *pres = Z_PRES_FAILURE; - return diagrec(a->proto, fres->errcode, fres->errstring); + return diagrec(a, fres->errcode, fres->errstring); } if (fres->len >= 0) this_length = fres->len; @@ -924,20 +935,22 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (toget > 1) { logf(LOG_DEBUG, " Dropped it"); - reclist.records[reclist.num_records] = - surrogatediagrec(a->proto, fres->basename, 16, 0); - reclist.num_records++; + reclist->records[reclist->num_records] = + surrogatediagrec(a, fres->basename, 16, 0); + reclist->num_records++; *next = fres->last_in_set ? 0 : recno + 1; + dumped_records += this_length; continue; } } else /* too big entirely */ { logf(LOG_DEBUG, "Record > maxrcdsz"); - reclist.records[reclist.num_records] = - surrogatediagrec(a->proto, fres->basename, 17, 0); - reclist.num_records++; + reclist->records[reclist->num_records] = + surrogatediagrec(a, fres->basename, 17, 0); + reclist->num_records++; *next = fres->last_in_set ? 0 : recno + 1; + dumped_records += this_length; continue; } } @@ -955,7 +968,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, 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 */ @@ -1005,12 +1018,12 @@ static Z_Records *pack_records(association *a, char *setname, int start, thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = fres->len; } - reclist.records[reclist.num_records] = thisrec; - reclist.num_records++; + reclist->records[reclist->num_records] = thisrec; + reclist->num_records++; *next = fres->last_in_set ? 0 : recno + 1; } - *num = reclist.num_records; - return &records; + *num = reclist->num_records; + return records; } static Z_APDU *process_searchRequest(association *assoc, request *reqb, @@ -1027,6 +1040,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrq.num_bases = req->num_databaseNames; bsrq.basenames = req->databaseNames; bsrq.query = req->query; + bsrq.stream = assoc->encode; if (!(bsrt = bend_search(assoc->backend, &bsrq, fd))) return 0; @@ -1046,20 +1060,23 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, bend_searchresult *bsrt, int *fd) { Z_SearchRequest *req = reqb->request->u.searchRequest; - static Z_APDU apdu; - static Z_SearchResponse resp; - static int nulint = 0; - static bool_t sr = 1; - static int next = 0; - static int none = Z_RES_NONE; - - apdu.which = Z_APDU_searchResponse; - apdu.u.searchResponse = &resp; - resp.referenceId = req->referenceId; -#ifdef Z_95 - resp.additionalSearchInfo = 0; - resp.otherInfo = 0; -#endif + Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu)); + Z_SearchResponse *resp = odr_malloc (assoc->encode, sizeof(*resp)); + int *nulint = odr_malloc (assoc->encode, sizeof(*nulint)); + bool_t *sr = odr_malloc (assoc->encode, sizeof(*sr)); + int *next = odr_malloc (assoc->encode, sizeof(*next)); + int *none = odr_malloc (assoc->encode, sizeof(*none)); + + *nulint = 0; + *sr = 1; + *next = 0; + *none = Z_RES_NONE; + + apdu->which = Z_APDU_searchResponse; + apdu->u.searchResponse = resp; + resp->referenceId = req->referenceId; + resp->additionalSearchInfo = 0; + resp->otherInfo = 0; *fd = -1; if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend))) { @@ -1068,44 +1085,45 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } else if (bsrt->errcode) { - resp.records = diagrec(assoc->proto, bsrt->errcode, - bsrt->errstring); - resp.resultCount = &nulint; - resp.numberOfRecordsReturned = &nulint; - resp.nextResultSetPosition = &nulint; - resp.searchStatus = &nulint; - resp.resultSetStatus = &none; - resp.presentStatus = 0; + resp->records = diagrec(assoc, bsrt->errcode, bsrt->errstring); + resp->resultCount = nulint; + resp->numberOfRecordsReturned = nulint; + resp->nextResultSetPosition = nulint; + resp->searchStatus = nulint; + resp->resultSetStatus = none; + resp->presentStatus = 0; } else { - static int toget; + int *toget = odr_malloc (assoc->encode, sizeof(*toget)); + int *presst = odr_malloc (assoc->encode, sizeof(*presst)); Z_RecordComposition comp, *compp = 0; - static int presst = 0; - resp.records = 0; - resp.resultCount = &bsrt->hits; + *toget = 0; + *presst = 0; + resp->records = 0; + resp->resultCount = &bsrt->hits; comp.which = Z_RecordComp_simple; /* how many records does the user agent want, then? */ if (bsrt->hits <= *req->smallSetUpperBound) { - toget = bsrt->hits; + *toget = bsrt->hits; if ((comp.u.simple = req->smallSetElementSetNames)) compp = ∁ } else if (bsrt->hits < *req->largeSetLowerBound) { - toget = *req->mediumSetPresentNumber; - if (toget > bsrt->hits) - toget = bsrt->hits; + *toget = *req->mediumSetPresentNumber; + if (*toget > bsrt->hits) + *toget = bsrt->hits; if ((comp.u.simple = req->mediumSetElementSetNames)) compp = ∁ } else - toget = 0; + *toget = 0; - if (toget && !resp.records) + if (*toget && !resp->records) { oident *prefformat; oid_value form; @@ -1115,28 +1133,28 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, form = VAL_NONE; else form = prefformat->value; - resp.records = pack_records(assoc, req->resultSetName, 1, - &toget, compp, &next, &presst, form); - if (!resp.records) + resp->records = pack_records(assoc, req->resultSetName, 1, + toget, compp, next, presst, form); + if (!resp->records) return 0; - resp.numberOfRecordsReturned = &toget; - resp.nextResultSetPosition = &next; - resp.searchStatus = &sr; - resp.resultSetStatus = 0; - resp.presentStatus = &presst; + resp->numberOfRecordsReturned = toget; + resp->nextResultSetPosition = next; + resp->searchStatus = sr; + resp->resultSetStatus = 0; + resp->presentStatus = presst; } else { - if (*resp.resultCount) - next = 1; - resp.numberOfRecordsReturned = &nulint; - resp.nextResultSetPosition = &next; - resp.searchStatus = &sr; - resp.resultSetStatus = 0; - resp.presentStatus = 0; + if (*resp->resultCount) + *next = 1; + resp->numberOfRecordsReturned = nulint; + resp->nextResultSetPosition = next; + resp->searchStatus = sr; + resp->resultSetStatus = 0; + resp->presentStatus = 0; } } - return &apdu; + return apdu; } /* @@ -1158,37 +1176,40 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *fd) { Z_PresentRequest *req = reqb->request->u.presentRequest; - static Z_APDU apdu; - static Z_PresentResponse resp; - static int presst, next, num; + Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu)); + Z_PresentResponse *resp = odr_malloc (assoc->encode, sizeof(*resp)); + int *presst = odr_malloc (assoc->encode, sizeof(*presst)); + int *next = odr_malloc (assoc->encode, sizeof(*next)); + int *num = odr_malloc (assoc->encode, sizeof(*num)); oident *prefformat; oid_value form; - logf(LOG_LOG, "Got PresentRequest."); - apdu.which = Z_APDU_presentResponse; - apdu.u.presentResponse = &resp; - resp.referenceId = req->referenceId; -#ifdef Z_95 - resp.otherInfo = 0; -#endif + *presst = 0; + *next = 0; + *num = 0; + + apdu->which = Z_APDU_presentResponse; + apdu->u.presentResponse = resp; + resp->referenceId = req->referenceId; + resp->otherInfo = 0; if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || prefformat->oclass != CLASS_RECSYN) form = VAL_NONE; else form = prefformat->value; - num = *req->numberOfRecordsRequested; - resp.records = pack_records(assoc, req->resultSetId, - *req->resultSetStartPoint, &num, req->recordComposition, &next, - &presst, form); - if (!resp.records) + *num = *req->numberOfRecordsRequested; + resp->records = pack_records(assoc, req->resultSetId, + *req->resultSetStartPoint, num, req->recordComposition, next, + presst, form); + if (!resp->records) return 0; - resp.numberOfRecordsReturned = # - resp.presentStatus = &presst; - resp.nextResultSetPosition = &next; + resp->numberOfRecordsReturned = num; + resp->presentStatus = presst; + resp->nextResultSetPosition = next; - return &apdu; + return apdu; } /* @@ -1198,38 +1219,38 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { Z_ScanRequest *req = reqb->request->u.scanRequest; - static Z_APDU apdu; - static Z_ScanResponse res; - static int scanStatus = Z_Scan_failure; - static int numberOfEntriesReturned = 0; + Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu)); + Z_ScanResponse *res = odr_malloc (assoc->encode, sizeof(*res)); + int *scanStatus = odr_malloc (assoc->encode, sizeof(*scanStatus)); + int *numberOfEntriesReturned = + odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned)); + Z_ListEntries *ents = odr_malloc (assoc->encode, sizeof(*ents)); oident *attent; - static Z_ListEntries ents; -#define SCAN_MAX_ENTRIES 200 - static Z_Entry *tab[SCAN_MAX_ENTRIES]; bend_scanrequest srq; bend_scanresult *srs; oident *attset; logf(LOG_LOG, "Got scanrequest"); - apdu.which = Z_APDU_scanResponse; - apdu.u.scanResponse = &res; - res.referenceId = req->referenceId; - res.stepSize = 0; - res.scanStatus = &scanStatus; - res.numberOfEntriesReturned = &numberOfEntriesReturned; - res.positionOfTerm = 0; - res.entries = &ents; - ents.which = Z_ListEntries_nonSurrogateDiagnostics; - res.attributeSet = 0; -#ifdef Z_95 - res.otherInfo = 0; -#endif + *scanStatus = Z_Scan_failure; + *numberOfEntriesReturned = 0; + + apdu->which = Z_APDU_scanResponse; + apdu->u.scanResponse = res; + res->referenceId = req->referenceId; + res->stepSize = 0; + res->scanStatus = scanStatus; + res->numberOfEntriesReturned = numberOfEntriesReturned; + res->positionOfTerm = 0; + res->entries = ents; + ents->which = Z_ListEntries_nonSurrogateDiagnostics; + res->attributeSet = 0; + res->otherInfo = 0; if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) || attent->oclass != CLASS_ATTSET || attent->value != VAL_BIB1)) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0); + ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 121, 0); else if (req->stepSize && *req->stepSize > 0) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0); + ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 205, 0); else { if (req->termListAndStartPoint->term->which == Z_Term_general) @@ -1240,6 +1261,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) srq.basenames = req->databaseNames; srq.num_entries = *req->numberOfTermsRequested; srq.term = req->termListAndStartPoint; + srq.stream = assoc->encode; if (!(attset = oid_getentbyoid(req->attributeSet)) || attset->oclass != CLASS_RECSYN) srq.attributeset = VAL_NONE; @@ -1248,34 +1270,31 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) srq.term_position = req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1; if (!(srs = bend_scan(assoc->backend, &srq, 0))) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 2, 0); + ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 2, 0); else if (srs->errcode) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, + ents->u.nonSurrogateDiagnostics = diagrecs(assoc, srs->errcode, srs->errstring); else { int i; - static Z_Entries list; + Z_Entries *list = odr_malloc (assoc->encode, sizeof(*list)); + Z_Entry **tab = odr_malloc (assoc->encode, + sizeof(*tab) * srs->num_entries); if (srs->status == BEND_SCAN_PARTIAL) - scanStatus = Z_Scan_partial_5; + *scanStatus = Z_Scan_partial_5; else - scanStatus = Z_Scan_success; - ents.which = Z_ListEntries_entries; - ents.u.entries = &list; - list.entries = tab; + *scanStatus = Z_Scan_success; + ents->which = Z_ListEntries_entries; + ents->u.entries = list; + list->entries = tab; for (i = 0; i < srs->num_entries; i++) { Z_Entry *e; Z_TermInfo *t; Odr_oct *o; - if (i >= SCAN_MAX_ENTRIES) - { - scanStatus = Z_Scan_partial_4; - break; - } - list.entries[i] = e = odr_malloc(assoc->encode, sizeof(*e)); + list->entries[i] = e = odr_malloc(assoc->encode, sizeof(*e)); e->which = Z_Entry_termInfo; e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t)); t->suggestedAttributes = 0; @@ -1294,13 +1313,13 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) logf(LOG_DEBUG, " term #%d: '%s' (%d)", i, srs->entries[i].term, srs->entries[i].occurrences); } - list.num_entries = i; - res.numberOfEntriesReturned = &list.num_entries; - res.positionOfTerm = &srs->term_position; + list->num_entries = i; + res->numberOfEntriesReturned = &list->num_entries; + res->positionOfTerm = &srs->term_position; } } - return &apdu; + return apdu; } static void process_close(association *assoc, request *reqb)