X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-z-server.cpp;h=7f135a25f93fb7102d7441d71a88cf4eae46ebb1;hp=06992b7326a847b554680c9b18f9293647867929;hb=d53e0ff85ad63de947da013a0d25a434d12eed40;hpb=eea2caea1263bed0aae268f72d985cbb1822ac30 diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp index 06992b7..7f135a2 100644 --- a/src/yaz-z-server.cpp +++ b/src/yaz-z-server.cpp @@ -1,12 +1,11 @@ -/* - * Copyright (c) 2000-2004, Index Data. +/* This file is part of the yazpp toolkit. + * Copyright (C) 1998-2010 Index Data and Mike Taylor * See the file LICENSE for details. - * - * $Id: yaz-z-server.cpp,v 1.22 2005-06-08 13:28:06 adam Exp $ */ #include -#include +#include +#include using namespace yazpp_1; @@ -26,21 +25,21 @@ void Z_Server::facility_reset () Z_Server_Facility_Info *p = m_facilities; while (p) { - 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 Z_Server::facility_add(IServer_Facility *facility, - const char *name) + const char *name) { Z_Server_Facility_Info **p = &m_facilities; while (*p) - p = &(*p)->m_next; + p = &(*p)->m_next; *p = new Z_Server_Facility_Info; @@ -53,9 +52,9 @@ void Z_Server::facility_add(IServer_Facility *facility, void Z_Server::recv_GDU (Z_GDU *apdu, int len) { if (apdu->which == Z_GDU_Z3950) - recv_Z_PDU(apdu->u.z3950, len); + recv_Z_PDU(apdu->u.z3950, len); else - delete this; + delete this; } void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len) @@ -64,47 +63,47 @@ void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len) 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, 0); + 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 (YLOG_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; + } } } @@ -112,13 +111,14 @@ void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len) * database record. */ void Z_ServerUtility::create_databaseRecord ( - ODR odr, Z_NamePlusRecord *rec, const char *dbname, int format, + ODR odr, Z_NamePlusRecord *rec, const char *dbname, const Odr_oid *format, const void *buf, int len) { + Odr_oid *oid = odr_oiddup(odr, format); 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); + rec->u.databaseRecord = z_ext_record_oid(odr, oid, + (const char *) buf, len); } /* @@ -128,10 +128,10 @@ 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)); + Odr_int *err = (Odr_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(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); *err = error; @@ -140,8 +140,7 @@ void Z_ServerUtility::create_surrogateDiagnostics( rec->u.surrogateDiagnostic = drec; drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; - dr->diagnosticSetId = - yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1); + dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1); dr->condition = err; dr->which = Z_DefaultDiagFormat_v2Addinfo; @@ -153,7 +152,7 @@ Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics ( { Z_Records *rec = (Z_Records *) odr_malloc (odr, sizeof(*rec)); - int *err = (int *) + Odr_int *err = (Odr_int *) odr_malloc (odr, sizeof(*err)); Z_DiagRec *drec = (Z_DiagRec *) odr_malloc (odr, sizeof(*drec)); @@ -163,8 +162,7 @@ Z_Records *Z_ServerUtility::create_nonSurrogateDiagnostics ( *err = error; rec->which = Z_Records_NSD; rec->u.nonSurrogateDiagnostic = dr; - dr->diagnosticSetId = - yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1); + dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1); dr->condition = err; dr->which = Z_DefaultDiagFormat_v2Addinfo; @@ -186,9 +184,17 @@ void Z_ServerUtility::create_diagnostics ( drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; - dr->diagnosticSetId = - yaz_oidval_to_z3950oid (odr, CLASS_DIAGSET, VAL_BIB1); + dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1); dr->condition = odr_intdup (odr, error); dr->which = Z_DefaultDiagFormat_v2Addinfo; dr->u.v2Addinfo = odr_strdup (odr, addinfo ? addinfo : ""); } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +