X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=cb815fbf7bfb48568d5ac5766ed88c55f464f613;hp=d625106a9cb3c63b3fa77c91d5955dcfb41b2648;hb=c3a132ce4aea3bb358b185ef58781b4bef8745fc;hpb=813f1a77544956dd0e0f8b9cbdf491a6b01927cb diff --git a/server/seshigh.c b/server/seshigh.c index d625106..cb815fb 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.8 1995-03-22 10:13:21 quinn + * 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) + * + * Revision 1.9 1995/03/22 15:01:26 quinn + * Adjusting record packing. + * + * Revision 1.8 1995/03/22 10:13:21 quinn * Working on record packer * * Revision 1.7 1995/03/21 15:53:31 quinn @@ -26,39 +42,7 @@ * Partitioned server. * * Revision 1.1 1995/03/15 16:02:10 quinn - * Modded session.c seshigh.c - * - * Revision 1.10 1995/03/15 15:18:51 quinn - * Little changes to better support nonblocking I/O - * Added backend.h - * - * Revision 1.9 1995/03/15 13:20:23 adam - * Yet another bug fix in very dummy_database... - * - * Revision 1.8 1995/03/15 11:18:17 quinn - * Smallish changes. - * - * Revision 1.7 1995/03/15 09:40:15 adam - * Bug fixes in dummy_database_... - * - * Revision 1.6 1995/03/15 09:08:30 adam - * Take care of preferredMessageSize. - * - * Revision 1.5 1995/03/15 08:37:44 quinn - * Now we're pretty much set for nonblocking I/O. - * - * Revision 1.4 1995/03/15 08:27:20 adam - * PresentRequest changed to return MARC records from file 'dummy-records'. - * - * Revision 1.3 1995/03/14 16:59:48 quinn - * Bug-fixes - * - * Revision 1.2 1995/03/14 11:30:14 quinn - * Works better now. - * - * Revision 1.1 1995/03/14 10:28:01 quinn - * More work on demo server. - * + * Modded session.c to seshigh.c * */ @@ -69,6 +53,7 @@ #include #include #include +#include #include @@ -98,6 +83,10 @@ association *create_association(IOCHAN channel, COMSTACK link) new->state = ASSOC_UNINIT; new->input_buffer = 0; new->input_buffer_len = 0; + if (cs_getproto(link) == CS_Z3950) + new->proto = PROTO_Z3950; + else + new->proto = PROTO_SR; return new; } @@ -108,6 +97,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); } @@ -193,7 +184,8 @@ static int process_apdu(IOCHAN chan) fprintf(stderr, "Bad APDU\n"); return -1; } - odr_reset(assoc->decode); + odr_reset(assoc->decode); /* release incopming APDU */ + odr_reset(assoc->encode); /* release stuff alloced before encoding */ return res; } @@ -205,6 +197,7 @@ 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"); if (req->implementationId) @@ -221,15 +214,34 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) 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; - if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 500) - assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 500; + /* + * This is not so hot. The big todo for ODR is dynamic memory allocation + * on encoding. + */ + if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 1000) + assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 1000; assoc->preferredMessageSize = *req->preferredMessageSize; if (assoc->preferredMessageSize > assoc->maximumRecordSize) assoc->preferredMessageSize = assoc->maximumRecordSize; @@ -237,8 +249,8 @@ 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.8 $"; + resp.implementationName = "Index Data/YAZ Generic Frontend Server"; + resp.implementationVersion = "$Revision: 1.13 $"; resp.userInformationField = 0; if (!z_APDU(assoc->encode, &apdup, 0)) { @@ -251,43 +263,52 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) return 0; } -static Z_Records *diagrec(int error, char *addinfo) +static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) { static Z_Records rec; - static Odr_oid bib1[] = { 1, 2, 3, 4, 5, -1 }; + oident bib1; static Z_DiagRec dr; static int err; + bib1.proto = proto; + bib1.class = CLASS_DIAGSET; + bib1.value = VAL_BIB1; + fprintf(stderr, "Diagnostic: %d -- %s\n", error, addinfo ? addinfo : "NULL"); err = error; rec.which = Z_Records_NSD; rec.u.nonSurrogateDiagnostic = &dr; - dr.diagnosticSetId = bib1; + dr.diagnosticSetId = oid_getoidbyent(&bib1); dr.condition = &err; dr.addinfo = addinfo ? addinfo : ""; return &rec; } -static Z_NamePlusRecord *surrogatediagrec(char *dbname, int error, - char *addinfo) +static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, + int error, char *addinfo) { static Z_NamePlusRecord rec; static Z_DiagRec dr; - static Odr_oid bib1[] = { 1, 2, 3, 4, 5, -1 }; static int err; + oident bib1; + + bib1.proto = proto; + bib1.class = CLASS_DIAGSET; + bib1.value = VAL_BIB1; fprintf(stderr, "SurrogateDiagnotic: %d -- %s\n", error, addinfo); + err = error; rec.databaseName = dbname; rec.which = Z_NamePlusRecord_surrogateDiagnostic; rec.u.surrogateDiagnostic = &dr; - dr.diagnosticSetId = bib1; + dr.diagnosticSetId = oid_getoidbyent(&bib1); dr.condition = &err; dr.addinfo = addinfo ? addinfo : ""; return &rec; } -#define MAX_RECORDS 50 +#define MAX_RECORDS 256 static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_ElementSetNames *esn, @@ -297,6 +318,8 @@ static Z_Records *pack_records(association *a, char *setname, int start, static Z_Records records; static Z_NamePlusRecordList reclist; static Z_NamePlusRecord *list[MAX_RECORDS]; + oident recform; + Odr_oid *oid; records.which = Z_Records_DBOSD; records.u.databaseOrSurDiagnostics = &reclist; @@ -306,7 +329,16 @@ static Z_Records *pack_records(association *a, char *setname, int start, *num = 0; *next = 0; - for (recno = start; recno < toget; recno++) + recform.proto = a->proto; + recform.class = CLASS_RECSYN; + recform.value = VAL_USMARC; + 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, + a->maximumRecordSize); + for (recno = start; reclist.num_records < toget; recno++) { bend_fetchrequest freq; bend_fetchresult *fres; @@ -320,44 +352,52 @@ 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(2, "Backend interface problem"); + return diagrec(a->proto, 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(fres->errcode, fres->errstring); + return diagrec(a->proto, fres->errcode, fres->errstring); } + fprintf(stderr, " Got record, len=%d, total=%d\n", + 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"); *pres = Z_PRES_PARTIAL_2; break; } - /* record canonly be fetched by itself */ + /* record can only be fetched by itself */ if (fres->len < a->maximumRecordSize) { + fprintf(stderr, " Record > prefmsgsz\n"); if (toget > 1) { + fprintf(stderr, " Dropped it\n"); reclist.records[reclist.num_records] = - surrogatediagrec(fres->basename, 16, 0); + surrogatediagrec(a->proto, fres->basename, 16, 0); reclist.num_records++; *pres = Z_PRES_PARTIAL_2; + break; } } else /* too big entirely */ { + fprintf(stderr, "Record > maxrcdsz\n"); reclist.records[reclist.num_records] = - surrogatediagrec(fres->basename, - 17, 0); + surrogatediagrec(a->proto, fres->basename, 17, 0); reclist.num_records++; *pres = Z_PRES_PARTIAL_2; + break; } } if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec)))) @@ -370,7 +410,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode, sizeof(Z_DatabaseRecord)))) return 0; - thisext->direct_reference = 0; /* should be OID for current MARC */ + thisext->direct_reference = oid; /* should be OID for current MARC */ thisext->indirect_reference = 0; thisext->descriptor = 0; thisext->which = ODR_EXTERNAL_octet; @@ -384,7 +424,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, fres->len; reclist.records[reclist.num_records] = thisrec; reclist.num_records++; - total_length = fres->len; + total_length += fres->len; (*num)++; *next = fres->last_in_set ? 0 : recno + 1; } @@ -398,9 +438,10 @@ 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; fprintf(stderr, "Got SearchRequest.\n"); apdup = &apdu; @@ -408,26 +449,82 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) apdu.u.searchResponse = &resp; resp.referenceId = req->referenceId; - bsrq.setname = req->resultSetName; - bsrq.replace_set = *req->replaceIndicator; - bsrq.num_bases = req->num_databaseNames; - bsrq.basenames = req->databaseNames; - bsrq.query = req->query; + resp.records = 0; + if (req->query->which == Z_Query_type_1) + { + Z_RPNQuery *q = req->query->u.type_1; - if (!(bsrt = bend_search(&bsrq))) - return -1; - else if (bsrt->errcode) - resp.records = diagrec(bsrt->errcode, bsrt->errstring); + if (!(oent = oid_getentbyoid(q->attributeSetId)) || + oent->class != CLASS_ATTSET || + oent->value != VAL_BIB1) + resp.records = diagrec(assoc->proto, 121, 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(assoc->backend, &bsrq, 0))) + return -1; + else if (bsrt->errcode) + resp.records = diagrec(assoc->proto, bsrt->errcode, + bsrt->errstring); + else + resp.records = 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 = 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 = &sr; + resp.presentStatus = &presst; + } + else + { + resp.records = 0; + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &nulint; + resp.searchStatus = &sr; + resp.resultSetStatus = &sr; + 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; + { + resp.resultCount = &nulint; + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &nulint; + resp.searchStatus = &nulint; + resp.resultSetStatus = 0; + } if (!z_APDU(assoc->encode, &apdup, 0)) {