X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-server.cpp;h=ea59a4c6ab6ffc788e1c3954f324c6f42acffcf0;hb=da1f67a7cfc946f75fc80659b146898f3361f9c8;hp=0af5836b066cab059b20e7e6d85fbf6c43a20f3c;hpb=b93c75bec555a4b1bd2428a3af826d154b7a47f7;p=yazpp-moved-to-github.git diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp index 0af5836..ea59a4c 100644 --- a/src/yaz-z-server.cpp +++ b/src/yaz-z-server.cpp @@ -1,46 +1,48 @@ /* - * Copyright (c) 2000-2001, Index Data. + * Copyright (c) 2000-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-server.cpp,v 1.14 2002-04-24 12:21:03 adam Exp $ + * $Id: yaz-z-server.cpp,v 1.24 2006-03-29 13:14:18 adam Exp $ */ #include -#include +#include -Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable) - : Yaz_Z_Assoc(the_PDU_Observable) +using namespace yazpp_1; + +Z_Server::Z_Server(IPDU_Observable *the_PDU_Observable) + : Z_Assoc(the_PDU_Observable) { m_facilities = 0; } -Yaz_Z_Server::~Yaz_Z_Server() +Z_Server::~Z_Server() { facility_reset(); } -void Yaz_Z_Server::facility_reset () +void Z_Server::facility_reset () { - Yaz_Z_Server_Facility_Info *p = m_facilities; + Z_Server_Facility_Info *p = m_facilities; while (p) { - Yaz_Z_Server_Facility_Info *p_next = p->m_next; + Z_Server_Facility_Info *p_next = p->m_next; - delete [] p->m_name; - delete p; - p = p_next; + delete [] p->m_name; + delete p; + p = p_next; } m_facilities = 0; } -void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility, - const char *name) +void Z_Server::facility_add(IServer_Facility *facility, + const char *name) { - Yaz_Z_Server_Facility_Info **p = &m_facilities; + Z_Server_Facility_Info **p = &m_facilities; while (*p) - p = &(*p)->m_next; + p = &(*p)->m_next; - *p = new Yaz_Z_Server_Facility_Info; + *p = new Z_Server_Facility_Info; (*p)->m_next = 0; (*p)->m_name = new char [strlen(name)+1]; @@ -48,82 +50,90 @@ void Yaz_Z_Server::facility_add(IYaz_Server_Facility *facility, (*p)->m_facility = facility; } -void Yaz_Z_Server::recv_Z_PDU (Z_APDU *apdu_request) +void Z_Server::recv_GDU (Z_GDU *apdu, int len) +{ + if (apdu->which == Z_GDU_Z3950) + recv_Z_PDU(apdu->u.z3950, len); + else + delete this; +} + +void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len) { - Yaz_Z_Server_Facility_Info *f = m_facilities; + Z_Server_Facility_Info *f = m_facilities; if (apdu_request->which == Z_APDU_initRequest) { - Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse); - - Z_InitRequest *req = apdu_request->u.initRequest; - Z_InitResponse *resp = apdu_response->u.initResponse; - - if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) - { - ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1); - } - if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2)) - { - ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2); - } - if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3)) - { - ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3); - } - while (f) - { - f->m_facility->init(this, req, resp); - f = f->m_next; - } - transfer_referenceId(apdu_request, apdu_response); - send_Z_PDU(apdu_response); + Z_APDU *apdu_response = create_Z_PDU(Z_APDU_initResponse); + + Z_InitRequest *req = apdu_request->u.initRequest; + Z_InitResponse *resp = apdu_response->u.initResponse; + + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) + { + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1); + } + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2)) + { + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2); + } + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3)) + { + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3); + } + while (f) + { + f->m_facility->init(this, req, resp); + f = f->m_next; + } + transfer_referenceId(apdu_request, apdu_response); + send_Z_PDU(apdu_response, 0); } else { - f = m_facilities; - int taken = 0; - while (f) - { - taken = f->m_facility->recv(this, apdu_request); - if (taken) - break; - f = f->m_next; - } - if (!taken) - { - yaz_log (LOG_WARN, "unhandled request = %d", apdu_request->which); - delete this; - } + f = m_facilities; + int taken = 0; + while (f) + { + taken = f->m_facility->recv(this, apdu_request); + if (taken) + break; + f = f->m_next; + } + if (!taken) + { + yaz_log (YLOG_WARN, "unhandled request = %d", apdu_request->which); + delete this; + } } } /* * database record. */ -void Yaz_Z_ServerUtility::create_databaseRecord ( +void Z_ServerUtility::create_databaseRecord ( ODR odr, Z_NamePlusRecord *rec, const char *dbname, int format, const void *buf, int len) { rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0; rec->which = Z_NamePlusRecord_databaseRecord; rec->u.databaseRecord = z_ext_record (odr, format, - (const char *) buf, len); + (const char *) buf, len); } /* * surrogate diagnostic. */ -void Yaz_Z_ServerUtility::create_surrogateDiagnostics( +void Z_ServerUtility::create_surrogateDiagnostics( ODR odr, Z_NamePlusRecord *rec, const char *dbname, int error, char *const addinfo) { int *err = (int *)odr_malloc (odr, sizeof(*err)); Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec)); Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) - odr_malloc (odr, sizeof(*dr)); + odr_malloc (odr, sizeof(*dr)); - yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); + yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); *err = error; rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0; rec->which = Z_NamePlusRecord_surrogateDiagnostic; @@ -138,7 +148,7 @@ void Yaz_Z_ServerUtility::create_surrogateDiagnostics( dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : ""); } -Z_Records *Yaz_Z_ServerUtility::create_nonSurrogateDiagnostics ( +Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics ( ODR odr, int error, const char *addinfo) { Z_Records *rec = (Z_Records *) @@ -162,7 +172,7 @@ Z_Records *Yaz_Z_ServerUtility::create_nonSurrogateDiagnostics ( return rec; } -void Yaz_Z_ServerUtility::create_diagnostics ( +void Z_ServerUtility::create_diagnostics ( ODR odr, int error, const char *addinfo, Z_DiagRec ***dreca, int *num) { @@ -182,3 +192,11 @@ void Yaz_Z_ServerUtility::create_diagnostics ( dr->which = Z_DefaultDiagFormat_v2Addinfo; dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : ""); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +