X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-server.cpp;h=a2812f9161e49bcd3aea28412bbdf0a7d088f2ec;hb=67260891a47e8b76c5a38b7f418e5daea31fbab7;hp=ddc0bf0bd5f54d888cf790c9567cd4ae4529e3b3;hpb=35cfa3b3d2c9b8adb8c4bfd4c95620929e35466b;p=yazpp-moved-to-github.git diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp index ddc0bf0..a2812f9 100644 --- a/src/yaz-z-server.cpp +++ b/src/yaz-z-server.cpp @@ -1,9 +1,32 @@ /* - * Copyright (c) 2000, Index Data. + * Copyright (c) 2000-2001, Index Data. * See the file LICENSE for details. * * $Log: yaz-z-server.cpp,v $ - * Revision 1.2 2000-09-12 12:09:53 adam + * Revision 1.9 2001-03-29 15:14:26 adam + * Minor updates. + * + * Revision 1.8 2001/03/27 14:47:45 adam + * New server facility scheme. + * + * Revision 1.7 2001/03/26 14:43:49 adam + * New threaded PDU association. + * + * Revision 1.6 2001/01/29 11:18:24 adam + * Server sets OPTIONS search and present. + * + * Revision 1.5 2000/10/24 12:29:57 adam + * Fixed bug in proxy where a Yaz_ProxyClient could be owned by + * two Yaz_Proxy's (fatal). + * + * Revision 1.4 2000/10/11 11:58:17 adam + * Moved header files to include/yaz++. Switched to libtool and automake. + * Configure script creates yaz++-config script. + * + * Revision 1.3 2000/09/21 21:43:20 adam + * Better high-level server API. + * + * Revision 1.2 2000/09/12 12:09:53 adam * More work on high-level server. * * Revision 1.1 2000/09/08 10:23:42 adam @@ -12,269 +35,93 @@ */ #include -#include - +#include Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable) : Yaz_Z_Assoc(the_PDU_Observable) { + m_facilities = 0; +} + +Yaz_Z_Server::~Yaz_Z_Server() +{ + facility_reset(); +} + +void Yaz_Z_Server::facility_reset () +{ + Yaz_Z_Server_Facility_Info *p = m_facilities; + while (p) + { + Yaz_Z_Server_Facility_Info *p_next = p->m_next; + + delete [] p->m_name; + delete p; + p = p_next; + } + m_facilities = 0; } -Z_Records *Yaz_Z_Server::pack_records (const char *resultSetName, - int start, int *num, - Z_RecordComposition *comp, - int *next, int *pres, - int *format) +void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility, + const char *name) { -#if 0 - int recno, total_length = 0, toget = *num, dumped_records = 0; - Z_Records *records = - (Z_Records *) odr_malloc (odr_encode(), sizeof(*records)); - Z_NamePlusRecordList *reclist = - (Z_NamePlusRecordList *) odr_malloc (odr_encode(), sizeof(*reclist)); - Z_NamePlusRecord **list = - (Z_NamePlusRecord **) odr_malloc (odr_encode(), sizeof(*list) * toget); + Yaz_Z_Server_Facility_Info **p = &m_facilities; + while (*p) + p = &(*p)->m_next; - records->which = Z_Records_DBOSD; - records->u.databaseOrSurDiagnostics = reclist; - reclist->num_records = 0; - reclist->records = list; - *pres = Z_PRES_SUCCESS; - *num = 0; - *next = 0; + *p = new Yaz_Z_Server_Facility_Info; + + (*p)->m_next = 0; + (*p)->m_name = new char [strlen(name)+1]; + strcpy ((*p)->m_name, name); + (*p)->m_facility = facility; +} - yaz_log(LOG_LOG, "Request to pack %d+%d", start, toget); - yaz_log(LOG_DEBUG, "pms=%d, mrs=%d", m_preferredMessageSize, - m_maximumRecordSize); - for (recno = start; reclist->num_records < toget; recno++) +void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request) +{ + Yaz_Z_Server_Facility_Info *f = m_facilities; + + if (apdu_request->which == Z_APDU_initRequest) { - Z_NamePlusRecord *rec = - (Z_NamePlusRecord *) odr_malloc (odr_encode(), sizeof(*rec)); - rec->databaseName = 0; - rec->which = Z_NamePlusRecord_databaseRecord; - rec->u.databaseRecord = 0; + Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse); - Z_DefaultDiagFormat *diagnostics = (Z_DefaultDiagFormat *) - odr_malloc (odr_encode(), sizeof(*diagnostics)); - diagnostics->diagnosticSetId = 0; - diagnostics->condition = 0; - diagnostics->which = Z_DefaultDiagFormat_v2Addinfo; + Z_InitRequest *req = apdu_request->u.initRequest; + Z_InitResponse *resp = apdu_response->u.initResponse; - recv_Z_record (resultSetName, recno, format, comp, rec, diagnostics); - - bend_fetch_rr freq; - Z_NamePlusRecord *thisrec; - int this_length = 0; - /* - * we get the number of bytes allocated on the stream before any - * 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) - dumped_records; - freq.errcode = 0; - freq.errstring = 0; - freq.basename = 0; - freq.len = 0; - freq.record = 0; - freq.last_in_set = 0; - freq.setname = setname; - freq.surrogate_flag = 0; - freq.number = recno; - freq.comp = comp; - freq.request_format = format; - freq.request_format_raw = oid; - freq.output_format = format; - freq.output_format_raw = 0; - freq.stream = a->encode; - freq.print = a->print; - freq.surrogate_flag = 0; - freq.referenceId = referenceId; - (*a->init->bend_fetch)(a->backend, &freq); - /* backend should be able to signal whether error is system-wide - or only pertaining to current record */ - if (freq.errcode) + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) { - if (!freq.surrogate_flag) - { - *pres = Z_PRES_FAILURE; - return diagrec(a, freq.errcode, freq.errstring); - } - reclist->records[reclist->num_records] = - surrogatediagrec(a, freq.basename, freq.errcode, - freq.errstring); - reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; - continue; + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1); } - if (freq.len >= 0) - this_length = freq.len; - else - this_length = odr_total(a->encode) - total_length; - yaz_log(LOG_DEBUG, " fetched record, len=%d, total=%d", - this_length, total_length); - if (this_length + total_length > a->preferredMessageSize) + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2)) { - /* record is small enough, really */ - if (this_length <= a->preferredMessageSize) - { - yaz_log(LOG_DEBUG, " Dropped last normal-sized record"); - *pres = Z_PRES_PARTIAL_2; - break; - } - /* record can only be fetched by itself */ - if (this_length < a->maximumRecordSize) - { - yaz_log(LOG_DEBUG, " Record > prefmsgsz"); - if (toget > 1) - { - yaz_log(LOG_DEBUG, " Dropped it"); - reclist->records[reclist->num_records] = - surrogatediagrec(a, freq.basename, 16, 0); - reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; - dumped_records += this_length; - continue; - } - } - else /* too big entirely */ - { - yaz_log(LOG_DEBUG, "Record > maxrcdsz"); - reclist->records[reclist->num_records] = - surrogatediagrec(a, freq.basename, 17, 0); - reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; - dumped_records += this_length; - continue; - } + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2); } - - if (!(thisrec = (Z_NamePlusRecord *) - odr_malloc(a->encode, sizeof(*thisrec)))) - return 0; - if (!(thisrec->databaseName = (char *)odr_malloc(a->encode, - strlen(freq.basename) + 1))) - return 0; - strcpy(thisrec->databaseName, freq.basename); - thisrec->which = Z_NamePlusRecord_databaseRecord; - - if (freq.output_format_raw) + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3)) { - struct oident *ident = oid_getentbyoid(freq.output_format_raw); - freq.output_format = ident->value; + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3); } - thisrec->u.databaseRecord = z_ext_record(a->encode, freq.output_format, - freq.record, freq.len); - if (!thisrec->u.databaseRecord) - return 0; - reclist->records[reclist->num_records] = thisrec; - reclist->num_records++; - *next = freq.last_in_set ? 0 : recno + 1; - } - *num = reclist->num_records; - return records; -#endif - return 0; -} - -void Yaz_Z_Server::piggyback (Z_SearchRequest *req, - Z_SearchResponse *res) -{ - bool_t *sr = (bool_t *)odr_malloc (odr_encode(), sizeof(*sr)); - *sr = 1; - - int *next = (int *)odr_malloc (odr_encode(), sizeof(*next)); - *next = 0; - - int *toget = (int *)odr_malloc (odr_encode(), sizeof(*toget)); - *toget = 0; - - int *presst = (int *)odr_malloc (odr_encode(), sizeof(*presst)); - *presst = 0; - - Z_RecordComposition comp, *compp = 0; - int hits = *res->resultCount; - - int *nulint = (int *)odr_malloc (odr_encode(), sizeof(*nulint)); - *nulint = 0; - - res->records = 0; - - comp.which = Z_RecordComp_simple; - /* how many records does the user agent want, then? */ - if (hits <= *req->smallSetUpperBound) - { - *toget = hits; - if ((comp.u.simple = req->smallSetElementSetNames)) - compp = ∁ - } - else if (hits < *req->largeSetLowerBound) - { - *toget = *req->mediumSetPresentNumber; - if (*toget > hits) - *toget = hits; - if ((comp.u.simple = req->mediumSetElementSetNames)) - compp = ∁ - } - else - *toget = 0; - - if (*toget && !res->records) - { - res->records = - pack_records(req->resultSetName, 1, - toget, compp, next, presst, - req->preferredRecordSyntax); - if (!res->records) - return; - res->numberOfRecordsReturned = toget; - res->nextResultSetPosition = next; - res->searchStatus = sr; - res->resultSetStatus = 0; - res->presentStatus = presst; + while (f) + { + f->m_facility->init(this, req, resp); + f = f->m_next; + } + send_Z_PDU(apdu_response); } else { - if (hits) - *next = 1; - res->numberOfRecordsReturned = nulint; - res->nextResultSetPosition = next; - res->searchStatus = sr; - res->resultSetStatus = 0; - res->presentStatus = 0; - } -} - -void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request) -{ - Z_APDU *apdu_response; - switch (apdu_request->which) - { - case Z_APDU_initRequest: - logf (LOG_LOG, "got InitRequest"); - apdu_response = create_Z_PDU(Z_APDU_initResponse); - recv_Z_init (apdu_request->u.initRequest, - apdu_response->u.initResponse); - send_Z_PDU(apdu_response); - break; - case Z_APDU_searchRequest: - logf (LOG_LOG, "got SearchRequest"); - apdu_response = create_Z_PDU(Z_APDU_searchResponse); - recv_Z_search (apdu_request->u.searchRequest, - apdu_response->u.searchResponse); - if (!apdu_response->u.searchResponse->records) + f = m_facilities; + int taken = 0; + while (f) { - piggyback(apdu_request->u.searchRequest, - apdu_response->u.searchResponse); + taken = f->m_facility->recv(this, apdu_request); + if (taken) + break; + f = f->m_next; + } + if (!taken) + { + yaz_log (LOG_LOG, "got request = %d", apdu_request->which); + delete this; } - send_Z_PDU(apdu_response); - break; - case Z_APDU_presentRequest: - logf (LOG_LOG, "got PresentRequest"); - apdu_response = create_Z_PDU(Z_APDU_presentResponse); - recv_Z_present (apdu_request->u.presentRequest, - apdu_response->u.presentResponse); - send_Z_PDU(apdu_response); - break; } } -