X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=server%2Fseshigh.c;h=b6ecb75b64b1f25a5566c5b1b1316e5548f25ed6;hb=afff2d64ae8758642c8e88bfebff9c00a982daa4;hp=d625106a9cb3c63b3fa77c91d5955dcfb41b2648;hpb=813f1a77544956dd0e0f8b9cbdf491a6b01927cb;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index d625106..b6ecb75 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,14 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.8 1995-03-22 10:13:21 quinn + * 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 +33,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 +44,7 @@ #include #include #include +#include #include @@ -98,6 +74,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; } @@ -193,7 +173,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; } @@ -228,8 +209,12 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) resp.options = req->options; /* should check these */ resp.protocolVersion = req->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; @@ -238,7 +223,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) resp.result = &result; resp.implementationId = "YAZ"; resp.implementationName = "YAZ/Simple asynchronous test server"; - resp.implementationVersion = "$Revision: 1.8 $"; + resp.implementationVersion = "$Revision: 1.10 $"; resp.userInformationField = 0; if (!z_APDU(assoc->encode, &apdup, 0)) { @@ -251,43 +236,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 +291,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 +302,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; @@ -323,41 +328,49 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(fres = bend_fetch(&freq))) { *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 +383,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 +397,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; } @@ -401,6 +414,7 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) int nrp; bend_searchrequest bsrq; bend_searchresult *bsrt; + oident *oent; fprintf(stderr, "Got SearchRequest.\n"); apdup = &apdu; @@ -408,26 +422,47 @@ 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) + { + 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))) + return -1; + else if (bsrt->errcode) + resp.records = diagrec(assoc->proto, bsrt->errcode, bsrt->errstring); + 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.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)) {