X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-server.cpp;h=f4559756d3e940e9c815e46d436cf29f4a4e010d;hb=805b4fdf7b70b0e9b298064f24ceff0c1d38e05b;hp=71b8f399dfa1c1797e07e6ec18b29240db4c60cc;hpb=8353663886b90d762d43790780be6cb58fb93c8a;p=yazpp-moved-to-github.git diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp index 71b8f39..f455975 100644 --- a/src/yaz-z-server.cpp +++ b/src/yaz-z-server.cpp @@ -1,8 +1,11 @@ /* This file is part of the yazpp toolkit. - * Copyright (C) 1998-2011 Index Data and Mike Taylor + * Copyright (C) 1998-2013 Index Data and Mike Taylor * See the file LICENSE for details. */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -58,16 +61,16 @@ void Z_Server::recv_GDU (Z_GDU *apdu, int len) } void Z_Server::recv_Z_PDU (Z_APDU *apdu_request, int len) -{ +{ 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); @@ -132,7 +135,7 @@ void Z_ServerUtility::create_surrogateDiagnostics( Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (odr, sizeof(*drec)); Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) odr_malloc (odr, sizeof(*dr)); - + yaz_log(YLOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); *err = error; rec->databaseName = dbname ? odr_strdup (odr, dbname) : 0; @@ -177,11 +180,11 @@ void Z_ServerUtility::create_diagnostics ( Z_DiagRec *drec = (Z_DiagRec *) odr_malloc (odr, sizeof(*drec)); Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) odr_malloc (odr, sizeof(*dr)); - + *num = 1; *dreca = (Z_DiagRec **) odr_malloc (odr, sizeof(*dreca)); (*dreca)[0] = drec; - + drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; dr->diagnosticSetId = odr_oiddup(odr, yaz_oid_diagset_bib_1);