X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=2007f3e676f98ec22f23bb40cb594a84a8afa9f7;hp=cb815fbf7bfb48568d5ac5766ed88c55f464f613;hb=d32b1dbdc1f0392883547cc9e56c26f384a4c57f;hpb=c3a132ce4aea3bb358b185ef58781b4bef8745fc diff --git a/server/seshigh.c b/server/seshigh.c index cb815fb..2007f3e 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,19 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.13 1995-03-30 09:09:24 quinn + * Revision 1.17 1995-04-10 10:23:36 quinn + * Some work to add scan and other things. + * + * 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 @@ -47,6 +59,8 @@ */ #include +#include +#include #include #include @@ -54,17 +68,22 @@ #include #include #include +#include #include -#include - #define ENCODE_BUFFER_SIZE 10000 static int process_apdu(IOCHAN chan); static int process_initRequest(IOCHAN client, Z_InitRequest *req); static int process_searchRequest(IOCHAN client, Z_SearchRequest *req); static int process_presentRequest(IOCHAN client, Z_PresentRequest *req); +static int process_scanRequest(IOCHAN client, Z_ScanRequest *req); + +extern int dynamic; +extern char *apdufile; + +static FILE *apduf = 0; /* for use in static mode */ association *create_association(IOCHAN channel, COMSTACK link) { @@ -77,12 +96,51 @@ association *create_association(IOCHAN channel, COMSTACK link) if (!(new->decode = odr_createmem(ODR_DECODE)) || !(new->encode = odr_createmem(ODR_ENCODE))) return 0; + if (apdufile) + { + char filename[256]; + FILE *f; + + if (!(new->print = odr_createmem(ODR_PRINT))) + return 0; + if (*apdufile) + { + strcpy(filename, apdufile); + if (!dynamic) + { + if (!apduf) + { + if (!(apduf = fopen(filename, "w"))) + { + logf(LOG_WARN|LOG_ERRNO, "%s", filename); + return 0; + } + setvbuf(apduf, 0, _IONBF, 0); + } + f = apduf; + } + else + { + sprintf(filename + strlen(filename), ".%d", getpid()); + if (!(f = fopen(filename, "w"))) + { + logf(LOG_WARN|LOG_ERRNO, "%s", filename); + return 0; + } + setvbuf(f, 0, _IONBF, 0); + } + odr_setprint(new->print, f); + } + } + else + new->print = 0; if (!(new->encode_buffer = malloc(ENCODE_BUFFER_SIZE))) return 0; odr_setbuf(new->encode, new->encode_buffer, ENCODE_BUFFER_SIZE); 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 @@ -94,6 +152,8 @@ void destroy_association(association *h) { odr_destroy(h->decode); odr_destroy(h->encode); + if (h->print) + odr_destroy(h->print); free(h->encode_buffer); if (h->input_buffer) free(h->input_buffer); @@ -115,7 +175,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); @@ -126,7 +186,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); @@ -140,7 +199,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); @@ -153,7 +212,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); @@ -169,7 +228,14 @@ 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; + } + if (assoc->print && !z_APDU(assoc->print, &apdu, 0)) + { + logf(LOG_WARN, "ODR print error: %s", + odr_errlist[odr_geterror(assoc->print)]); return -1; } switch (apdu->which) @@ -180,8 +246,10 @@ static int process_apdu(IOCHAN chan) res = process_searchRequest(chan, apdu->u.searchRequest); break; case Z_APDU_presentRequest: res = process_presentRequest(chan, apdu->u.presentRequest); break; + case Z_APDU_scanRequest: + res = process_scanRequest(chan, apdu->u.scanRequest); break; default: - fprintf(stderr, "Bad APDU\n"); + logf(LOG_WARN, "Bad APDU"); return -1; } odr_reset(assoc->decode); /* release incopming APDU */ @@ -199,18 +267,18 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) 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; } @@ -250,11 +318,12 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) resp.result = &result; resp.implementationId = "YAZ"; resp.implementationName = "Index Data/YAZ Generic Frontend Server"; - resp.implementationVersion = "$Revision: 1.13 $"; + resp.implementationVersion = "$Revision: 1.17 $"; 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); @@ -274,7 +343,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; @@ -297,7 +366,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,6 +377,28 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, return &rec; } +static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) +{ + static Z_DiagRecs recs; + static Z_DiagRec *recp[1], rec; + static int err; + oident bib1; + + logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo); + bib1.proto = proto; + bib1.class = CLASS_DIAGSET; + bib1.value = VAL_BIB1; + + err = error; + recs.num_diagRecs = 1; + recs.diagRecs = recp; + recp[0] = &rec; + rec.diagnosticSetId = oid_getoidbyent(&bib1); + rec.condition = &err; + rec.addinfo = addinfo ? addinfo : ""; + return &recs; +} + #define MAX_RECORDS 256 static Z_Records *pack_records(association *a, char *setname, int start, @@ -335,8 +426,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++) { @@ -364,25 +455,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, " fetched 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++; @@ -392,7 +482,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++; @@ -442,8 +532,9 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) 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; @@ -457,7 +548,15 @@ 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) { @@ -474,61 +573,66 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) if (!(bsrt = bend_search(assoc->backend, &bsrq, 0))) return -1; 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; + } else + { resp.records = 0; - resp.resultCount = &bsrt->hits; + 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; + /* 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; + if (toget > bsrt->hits) + toget = bsrt->hits; + 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; + 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; + } } } - else - { - resp.resultCount = &nulint; - resp.numberOfRecordsReturned = &nulint; - resp.nextResultSetPosition = &nulint; - resp.searchStatus = &nulint; - resp.resultSetStatus = 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); @@ -544,7 +648,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; @@ -561,7 +665,107 @@ 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); + odr_reset(assoc->encode); + iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT); + return 0; +} + +static int process_scanRequest(IOCHAN client, Z_ScanRequest *req) +{ + association *assoc = iochan_getdata(client); + Z_APDU apdu, *apdup; + Z_ScanResponse res; + bend_scanrequest srq; + bend_scanresult *srs; + int scanStatus = Z_Scan_failure; + int numberOfEntriesReturned = 0; + oident *attent; + Z_ListEntries ents; +#define SCAN_MAX_ENTRIES 200 + Z_Entry *tab[SCAN_MAX_ENTRIES]; + + apdup = &apdu; + 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; + + if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) || + attent->class != CLASS_ATTSET || attent->value != VAL_BIB1)) + ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0); + else if (req->stepSize && *req->stepSize > 0) + ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0); + else + { + srq.num_bases = req->num_databaseNames; + srq.basenames = req->databaseNames; + srq.num_entries = *req->numberOfTermsRequested; + srq.term = req->termListAndStartPoint; + srq.term_position = req->preferredPositionInResponse ? + *req->preferredPositionInResponse : 1; + if (!(srs = bend_scan(assoc->backend, &srq, 0))) + ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 2, 0); + else if (srs->errcode) + ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, + srs->errcode, srs->errstring); + else + { + int i; + static Z_Entries list; + + if (srs->status == BEND_SCAN_PARTIAL) + scanStatus = Z_Scan_partial_5; + else + scanStatus = 1; /* Z_Scan_success; */ /* assumption for now */ + 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)); + e->which = Z_Entry_termInfo; + e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t)); + t->suggestedAttributes = 0; + t->alternativeTerm = 0; + t->byAttributes = 0; + t->globalOccurrences = &srs->entries[i].occurrences; + t->term = odr_malloc(assoc->encode, sizeof(*t->term)); + t->term->which = Z_Term_general; + t->term->u.general = o = odr_malloc(assoc->encode, + sizeof(Odr_oct)); + o->buf = odr_malloc(assoc->encode, o->len = o->size = + strlen(srs->entries[i].term)); + memcpy(o->buf, srs->entries[i].term, o->len); + } + list.num_entries = i; + res.numberOfEntriesReturned = &list.num_entries; + res.positionOfTerm = &srs->term_position; + } + } + if (!z_APDU(assoc->encode, &apdup, 0)) + { + logf(LOG_FATAL, "ODR error encoding initres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len);