X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=436de77d4b1fb843338c3c99d475c59bb6a28f6c;hb=c7fa0e1f18e00b58b65b39b3c36cb68930e3838c;hp=b6ecb75b64b1f25a5566c5b1b1316e5548f25ed6;hpb=afff2d64ae8758642c8e88bfebff9c00a982daa4;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index b6ecb75..436de77 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,25 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.10 1995-03-27 08:34:24 quinn + * Revision 1.16 1995-03-31 09:18:55 quinn + * Added logging. + * + * Revision 1.15 1995/03/30 14:03:23 quinn + * Added RFC1006 as separate library + * + * Revision 1.14 1995/03/30 12:18:17 quinn + * Fixed bug. + * + * Revision 1.13 1995/03/30 09:09:24 quinn + * Added state-handle and some support for asynchronous activities. + * + * Revision 1.12 1995/03/29 15:40:16 quinn + * Ongoing work. Statserv is now dynamic by default + * + * Revision 1.11 1995/03/28 09:16:21 quinn + * Added record packing to the search request + * + * Revision 1.10 1995/03/27 08:34:24 quinn * Added dynamic server functionality. * Released bindings to session.c (is now redundant) * @@ -45,11 +63,11 @@ #include #include #include +#include +#include #include -#include - #define ENCODE_BUFFER_SIZE 10000 static int process_apdu(IOCHAN chan); @@ -74,6 +92,7 @@ association *create_association(IOCHAN channel, COMSTACK link) new->state = ASSOC_UNINIT; new->input_buffer = 0; new->input_buffer_len = 0; + new->backend = 0; if (cs_getproto(link) == CS_Z3950) new->proto = PROTO_Z3950; else @@ -88,6 +107,8 @@ void destroy_association(association *h) free(h->encode_buffer); if (h->input_buffer) free(h->input_buffer); + if (h->backend) + bend_close(h->backend); free(h); } @@ -104,7 +125,7 @@ void ir_session(IOCHAN h, int event) switch (res) { case 0: case -1: /* connection closed by peer */ - fprintf(stderr, "Closed connection\n"); + logf(LOG_LOG, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -115,7 +136,6 @@ void ir_session(IOCHAN h, int event) assoc->input_apdu_len = res; if (process_apdu(h) < 0) { - fprintf(stderr, "Operation failed\n"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -129,7 +149,7 @@ void ir_session(IOCHAN h, int event) switch (res = cs_put(conn, assoc->encode_buffer, assoc->encoded_len)) { case -1: - fprintf(stderr, "Closed connection\n"); + logf(LOG_LOG, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -142,7 +162,7 @@ void ir_session(IOCHAN h, int event) } else if (event == EVENT_EXCEPT) { - fprintf(stderr, "Exception on line\n"); + logf(LOG_LOG, "Exception on line"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -158,7 +178,8 @@ static int process_apdu(IOCHAN chan) odr_setbuf(assoc->decode, assoc->input_buffer, assoc->input_apdu_len); if (!z_APDU(assoc->decode, &apdu, 0)) { - odr_perror(assoc->decode, "Incoming APDU"); + logf(LOG_WARN, "ODR error: %s", + odr_errlist[odr_geterror(assoc->decode)]); return -1; } switch (apdu->which) @@ -170,7 +191,7 @@ static int process_apdu(IOCHAN chan) case Z_APDU_presentRequest: res = process_presentRequest(chan, apdu->u.presentRequest); break; default: - fprintf(stderr, "Bad APDU\n"); + logf(LOG_WARN, "Bad APDU"); return -1; } odr_reset(assoc->decode); /* release incopming APDU */ @@ -186,28 +207,44 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) association *assoc = iochan_getdata(client); bend_initrequest binitreq; bend_initresult *binitres; + Odr_bitmask options, protocolVersion; - fprintf(stderr, "Got initRequest.\n"); + logf(LOG_LOG, "Got initRequest"); if (req->implementationId) - fprintf(stderr, "Id: %s\n", req->implementationId); + logf(LOG_LOG, "Id: %s", req->implementationId); if (req->implementationName) - fprintf(stderr, "Name: %s\n", req->implementationName); + logf(LOG_LOG, "Name: %s", req->implementationName); if (req->implementationVersion) - fprintf(stderr, "Version: %s\n", req->implementationVersion); + logf(LOG_LOG, "Version: %s", req->implementationVersion); binitreq.configname = "default-config"; if (!(binitres = bend_init(&binitreq)) || binitres->errcode) { - fprintf(stderr, "Bad response from backend\n"); + logf(LOG_WARN, "Bad response from backend"); return -1; } + assoc->backend = binitres->handle; apdup = &apdu; apdu.which = Z_APDU_initResponse; apdu.u.initResponse = &resp; resp.referenceId = req->referenceId; - resp.options = req->options; /* should check these */ - resp.protocolVersion = req->protocolVersion; + ODR_MASK_ZERO(&options); + if (ODR_MASK_GET(req->options, Z_Options_search)) + ODR_MASK_SET(&options, Z_Options_search); + if (ODR_MASK_GET(req->options, Z_Options_present)) + ODR_MASK_SET(&options, Z_Options_present); + if (ODR_MASK_GET(req->options, Z_Options_delSet)) + ODR_MASK_SET(&options, Z_Options_delSet); + if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) + ODR_MASK_SET(&options, Z_Options_namedResultSets); + resp.options = &options; + ODR_MASK_ZERO(&protocolVersion); + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) + ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_1); + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2)) + ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_2); + resp.protocolVersion = &protocolVersion; assoc->maximumRecordSize = *req->maximumRecordSize; /* * This is not so hot. The big todo for ODR is dynamic memory allocation @@ -222,12 +259,13 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) resp.maximumRecordSize = &assoc->maximumRecordSize; resp.result = &result; resp.implementationId = "YAZ"; - resp.implementationName = "YAZ/Simple asynchronous test server"; - resp.implementationVersion = "$Revision: 1.10 $"; + resp.implementationName = "Index Data/YAZ Generic Frontend Server"; + resp.implementationVersion = "$Revision: 1.16 $"; resp.userInformationField = 0; if (!z_APDU(assoc->encode, &apdup, 0)) { - odr_perror(assoc->encode, "Encode initres"); + logf(LOG_FATAL, "ODR error encoding initres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len); @@ -247,7 +285,7 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) bib1.class = CLASS_DIAGSET; bib1.value = VAL_BIB1; - fprintf(stderr, "Diagnostic: %d -- %s\n", error, addinfo ? addinfo : + logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : "NULL"); err = error; rec.which = Z_Records_NSD; @@ -270,7 +308,7 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, bib1.class = CLASS_DIAGSET; bib1.value = VAL_BIB1; - fprintf(stderr, "SurrogateDiagnotic: %d -- %s\n", error, addinfo); + logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); err = error; rec.databaseName = dbname; rec.which = Z_NamePlusRecord_surrogateDiagnostic; @@ -308,8 +346,8 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(oid = odr_oiddup(a->encode, oid_getoidbyent(&recform)))) return 0; - fprintf(stderr, "Request to pack %d+%d\n", start, toget); - fprintf(stderr, "pms=%d, mrs=%d\n", a->preferredMessageSize, + 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++) { @@ -325,7 +363,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, } freq.setname = setname; freq.number = recno; - if (!(fres = bend_fetch(&freq))) + if (!(fres = bend_fetch(a->backend, &freq, 0))) { *pres = Z_PRES_FAILURE; return diagrec(a->proto, 2, "Backend interface problem"); @@ -337,25 +375,24 @@ static Z_Records *pack_records(association *a, char *setname, int start, *pres = Z_PRES_FAILURE; return diagrec(a->proto, fres->errcode, fres->errstring); } - fprintf(stderr, " Got record, len=%d, total=%d\n", + logf(LOG_DEBUG, " Got record, len=%d, total=%d", fres->len, total_length); if (fres->len + total_length > a->preferredMessageSize) { - fprintf(stderr, " In drop-zone\n"); /* record is small enough, really */ if (fres->len <= a->preferredMessageSize) { - fprintf(stderr, " Dropped last normal-sized record\n"); + logf(LOG_DEBUG, " Dropped last normal-sized record"); *pres = Z_PRES_PARTIAL_2; break; } /* record can only be fetched by itself */ if (fres->len < a->maximumRecordSize) { - fprintf(stderr, " Record > prefmsgsz\n"); + logf(LOG_DEBUG, " Record > prefmsgsz"); if (toget > 1) { - fprintf(stderr, " Dropped it\n"); + logf(LOG_DEBUG, " Dropped it"); reclist.records[reclist.num_records] = surrogatediagrec(a->proto, fres->basename, 16, 0); reclist.num_records++; @@ -365,7 +402,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, } else /* too big entirely */ { - fprintf(stderr, "Record > maxrcdsz\n"); + logf(LOG_DEBUG, "Record > maxrcdsz"); reclist.records[reclist.num_records] = surrogatediagrec(a->proto, fres->basename, 17, 0); reclist.num_records++; @@ -411,12 +448,13 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) association *assoc = iochan_getdata(client); int nulint = 0; bool_t sr = 1; - int nrp; bend_searchrequest bsrq; bend_searchresult *bsrt; oident *oent; + int next = 0; + static int none = Z_RES_NONE; - fprintf(stderr, "Got SearchRequest.\n"); + logf(LOG_LOG, "Got SearchRequest."); apdup = &apdu; apdu.which = Z_APDU_searchResponse; apdu.u.searchResponse = &resp; @@ -430,43 +468,89 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) if (!(oent = oid_getentbyoid(q->attributeSetId)) || oent->class != CLASS_ATTSET || oent->value != VAL_BIB1) + { resp.records = diagrec(assoc->proto, 121, 0); + resp.resultCount = &nulint; + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &nulint; + resp.searchStatus = &none; + resp.resultSetStatus = 0; + resp.presentStatus = 0; + } } if (!resp.records) { + int toget; + Z_ElementSetNames *setnames; + int presst = 0; + bsrq.setname = req->resultSetName; bsrq.replace_set = *req->replaceIndicator; bsrq.num_bases = req->num_databaseNames; bsrq.basenames = req->databaseNames; bsrq.query = req->query; - if (!(bsrt = bend_search(&bsrq))) + if (!(bsrt = bend_search(assoc->backend, &bsrq, 0))) return -1; else if (bsrt->errcode) - resp.records = diagrec(assoc->proto, bsrt->errcode, bsrt->errstring); + { + + 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; + } else + { resp.records = 0; - resp.resultCount = &bsrt->hits; - resp.numberOfRecordsReturned = &nulint; - nrp = bsrt->hits ? 1 : 0; - resp.nextResultSetPosition = &nrp; - resp.searchStatus = &sr; - resp.resultSetStatus = &sr; - resp.presentStatus = 0; - } - else - { - resp.resultCount = &nulint; - resp.numberOfRecordsReturned = &nulint; - resp.nextResultSetPosition = &nulint; - resp.searchStatus = &nulint; - resp.resultSetStatus = 0; + resp.resultCount = &bsrt->hits; + + /* how many records does the user agent want, then? */ + if (bsrt->hits <= *req->smallSetUpperBound) + { + toget = bsrt->hits; + setnames = req->smallSetElementSetNames; + } + else if (bsrt->hits < *req->largeSetLowerBound) + { + toget = *req->mediumSetPresentNumber; + setnames = req->mediumSetElementSetNames; + } + else + toget = 0; + + if (toget && !resp.records) + { + resp.records = pack_records(assoc, req->resultSetName, 1, + &toget, setnames, &next, &presst); + if (!resp.records) + return -1; + resp.numberOfRecordsReturned = &toget; + resp.nextResultSetPosition = &next; + resp.searchStatus = &sr; + resp.resultSetStatus = 0; + resp.presentStatus = &presst; + } + else + { + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &next; + resp.searchStatus = &sr; + resp.resultSetStatus = 0; + resp.presentStatus = 0; + } + } } if (!z_APDU(assoc->encode, &apdup, 0)) { - odr_perror(assoc->encode, "Encode searchres"); + logf(LOG_FATAL, "ODR error encoding searchres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len); @@ -482,7 +566,7 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req) association *assoc = iochan_getdata(client); int presst, next, num; - fprintf(stderr, "Got PresentRequest.\n"); + logf(LOG_LOG, "Got PresentRequest."); apdup = &apdu; apdu.which = Z_APDU_presentResponse; apdu.u.presentResponse = &resp; @@ -499,7 +583,8 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req) if (!z_APDU(assoc->encode, &apdup, 0)) { - odr_perror(assoc->encode, "Encode presentres"); + logf(LOG_FATAL, "ODR error encoding initres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len);