-/* $Id: gduutil.cpp,v 1.4 2006-08-30 15:56:54 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+ Copyright (C) Index Data
- See the LICENSE file for details
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "gduutil.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
#include <yaz/wrbuf.h>
+#include <yaz/oid_db.h>
#include <yaz/querytowrbuf.h>
#include <iostream>
-#include <list>
namespace mp = metaproxy_1;
// Doxygen doesn't like mp::gdu, so we use this instead
-namespace mp_gdu = metaproxy_1::gdu;
+namespace mp_util = metaproxy_1::util;
std::ostream& std::operator<<(std::ostream& os, Z_GDU& zgdu)
{
if (zgdu.which == Z_GDU_Z3950)
- os << "Z3950" << " " << *(zgdu.u.z3950) ;
+ {
+ os << "Z3950";
+ if (zgdu.u.z3950)
+ os << *(zgdu.u.z3950);
+ }
else if (zgdu.which == Z_GDU_HTTP_Request)
- os << "HTTP_Request" << " " << *(zgdu.u.HTTP_Request);
+ {
+ os << "HTTP_Request";
+ if (zgdu.u.HTTP_Request)
+ os << " " << *(zgdu.u.HTTP_Request);
+ }
else if (zgdu.which == Z_GDU_HTTP_Response)
- os << "HTTP_Response" << " " << *(zgdu.u.HTTP_Response);
+ {
+ os << "HTTP_Response";
+ if (zgdu.u.HTTP_Response)
+ os << " " << *(zgdu.u.HTTP_Response);
+ }
else
os << "Z_GDU";
return os;
std::ostream& std::operator<<(std::ostream& os, Z_HTTP_Request& httpreq)
{
os << httpreq.method << " ";
- os << httpreq.path;
+ os << httpreq.path;
return os;
}
-
std::ostream& std::operator<<(std::ostream& os, Z_HTTP_Response& httpres)
{
os << httpres.code << " ";
- os << httpres.content_len;
+ os << httpres.content_len;
return os;
}
std::ostream& std::operator<<(std::ostream& os, Z_Records & rs)
{
- switch(rs.which) {
+ switch (rs.which)
+ {
case Z_Records_DBOSD :
break;
case Z_Records_NSD:
- os << *(rs.u.nonSurrogateDiagnostic);
+ if (rs.u.nonSurrogateDiagnostic)
+ os << *(rs.u.nonSurrogateDiagnostic);
break;
case Z_Records_multipleNSD:
- os << "Z_Records_multipleNSD";
- //os << *(rs.u.multipleNonSurDiagnostics);
+ os << *(rs.u.multipleNonSurDiagnostics);
break;
default:
os << "Z_Records" ;
}
-
+
return os;
}
+std::ostream& std::operator<<(std::ostream& os, Z_DiagRecs& dr)
+{
+ if (dr.num_diagRecs >= 1)
+ {
+ os << *dr.diagRecs[0];
+ }
+ else
+ {
+ os << "multipleNSD";
+ }
+ return os;
+}
+
+
std::ostream& std::operator<<(std::ostream& os, Z_DiagRec& dr)
{
- switch(dr.which) {
+ switch (dr.which)
+ {
case Z_DiagRec_defaultFormat:
- os << *(dr.u.defaultFormat);
+ if (dr.u.defaultFormat)
+ os << *(dr.u.defaultFormat);
break;
case Z_DiagRec_externallyDefined :
os << "Z_DiagRec_externallyDefined";
default:
os << "Z_DiagRec" ;
}
-
+
return os;
}
std::ostream& std::operator<<(std::ostream& os, Z_DefaultDiagFormat& ddf)
{
- os << *(ddf.condition) << " ";
- switch(ddf.which) {
+ if (ddf.condition)
+ os << *(ddf.condition) << " ";
+
+ switch (ddf.which)
+ {
case Z_DefaultDiagFormat_v2Addinfo:
+ os << "\"";
os << ddf.u.v2Addinfo;
+ os << "\"";
break;
case Z_DefaultDiagFormat_v3Addinfo:
+ os << "\"";
os << ddf.u.v3Addinfo;
+ os << "\"";
break;
default:
- os << "Z_DefaultDiagFormat" ;
+ os << "-";
}
-
+
return os;
}
+static void dump_opt_string(std::ostream& os, const char *s)
+{
+ os << " ";
+ if (s)
+ os << s;
+ else
+ os << "-";
+}
+
+static void dump_opt_int_l(std::ostream& os, const Odr_int *i, const char *lead)
+{
+ os << lead;
+ if (i)
+ os << *i;
+ else
+ os << "-";
+}
+
+static void dump_opt_int(std::ostream& os, const Odr_int *i)
+{
+ dump_opt_int_l(os, i, " ");
+}
+
std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu)
{
switch(zapdu.which) {
case Z_APDU_initRequest:
- os << "initRequest" << " ";
-
+ os << " " << "initRequest";
+
{
- Z_InitRequest *ir
+ Z_InitRequest *ir
= zapdu.u.initRequest;
Z_IdAuthentication *a = ir->idAuthentication;
- if (a && a->which == Z_IdAuthentication_idPass )
- os << a->u.idPass->userId << " ";
- //<< ":" << a->u.idPass->groupId << " ";
+ if (a && a->which == Z_IdAuthentication_idPass)
+ dump_opt_string(os, a->u.idPass->userId);
+ else if (a && a->which == Z_IdAuthentication_open)
+ dump_opt_string(os, a->u.open);
else
- os << "--" << " ";
+ dump_opt_string(os, 0);
+ os << " ";
std::list<std::string> vhosts;
mp::util::get_vhost_otherinfo(ir->otherInfo, vhosts);
if (vhosts.size()){
- copy(vhosts.begin(), vhosts.end(),
+ copy(vhosts.begin(), vhosts.end(),
ostream_iterator<string>(os, " "));
}
- else
- os << "--" << " " ;
+ else
+ os << "-" ;
- os << (ir->implementationId) << " "
- //<< ir->referenceId << " "
- << (ir->implementationName) << " "
- << (ir->implementationVersion);
+ dump_opt_string(os, ir->implementationId);
+ dump_opt_string(os, ir->implementationName);
+ dump_opt_string(os, ir->implementationVersion);
}
break;
case Z_APDU_initResponse:
- os << "initResponse" << " ";
+ os << " " << "initResponse ";
{
- Z_InitResponse *ir
+ Z_InitResponse *ir
= zapdu.u.initResponse;
- if (*(ir->result))
- os << "OK" << " "
- << (ir->implementationId) << " "
- //<< ir->referenceId << " "
- << (ir->implementationName) << " "
- << (ir->implementationVersion) << " ";
+ if (ir->result && *(ir->result))
+ {
+ os << "OK";
+ }
else
- os << "DIAG";
+ {
+ os << "FAIL";
+ }
+ dump_opt_string(os, ir->implementationId);
+ dump_opt_string(os, ir->implementationName);
+ dump_opt_string(os, ir->implementationVersion);
}
break;
case Z_APDU_searchRequest:
- os << "searchRequest" << " ";
- {
- Z_SearchRequest *sr
+ os << " " << "searchRequest" << " ";
+ {
+ Z_SearchRequest *sr
= zapdu.u.searchRequest;
-
+
for (int i = 0; i < sr->num_databaseNames; i++)
{
os << sr->databaseNames[i];
- if (i+1 == sr->num_databaseNames)
- os << " ";
- else
+ if (i+1 != sr->num_databaseNames)
os << "+";
}
-
- WRBUF wr = wrbuf_alloc();
+
+ dump_opt_string(os, sr->resultSetName);
+
+ os << " ";
+ if (sr->preferredRecordSyntax)
+ {
+ char oid_name_str[OID_STR_MAX];
+ os << yaz_oid_to_string_buf(
+ sr->preferredRecordSyntax, 0, oid_name_str);
+ }
+ else
+ os << "-";
+
+ os << " ";
+ mp::wrbuf wr;
yaz_query_to_wrbuf(wr, sr->query);
- os << wrbuf_buf(wr);
- wrbuf_free(wr, 1);
+ os << wrbuf_cstr(wr);
}
break;
case Z_APDU_searchResponse:
- os << "searchResponse" << " ";
+ os << " " << "searchResponse ";
{
- Z_SearchResponse *sr
- = zapdu.u.searchResponse;
- if (*(sr->searchStatus))
- os << "OK" << " "
- << *(sr->resultCount) << " "
- //<< sr->referenceId << " "
- << *(sr->numberOfRecordsReturned) << " "
- << *(sr->nextResultSetPosition);
- else
- if (sr->records)
- os << "DIAG " << *(sr->records);
- else
- os << "ERROR";
+ Z_SearchResponse *sr = zapdu.u.searchResponse;
+ if (!sr->searchStatus)
+ os << "Unknown";
+ else if (*sr->searchStatus)
+ os << "OK";
+ else
+ os << "Failure";
+ if (sr->records && sr->records->which != Z_Records_DBOSD)
+ {
+ os << " DIAG " << *sr->records;
+ }
+ else
+ {
+ dump_opt_int(os, sr->resultCount);
+ dump_opt_int_l(os, sr->numberOfRecordsReturned, " 1+");
+ dump_opt_int(os, sr->nextResultSetPosition);
+ }
}
break;
case Z_APDU_presentRequest:
- os << "presentRequest" << " ";
+ os << " " << "presentRequest";
{
Z_PresentRequest *pr = zapdu.u.presentRequest;
- os << pr->resultSetId << " "
- //<< pr->referenceId << " "
- << *(pr->resultSetStartPoint) << " "
- << *(pr->numberOfRecordsRequested);
+ dump_opt_string(os, pr->resultSetId);
+ dump_opt_int(os, pr->resultSetStartPoint);
+ dump_opt_int_l(os, pr->numberOfRecordsRequested, "+");
+ if (pr->preferredRecordSyntax)
+ {
+ char oid_name_str[OID_STR_MAX];
+ const char *oid_name = yaz_oid_to_string_buf(
+ pr->preferredRecordSyntax, 0, oid_name_str);
+
+ os << " " << oid_name;
+ }
+ else
+ os << " -";
+ const char * msg = 0;
+ if (pr->recordComposition)
+ msg = mp_util::record_composition_to_esn(pr->recordComposition);
+ dump_opt_string(os, msg);
}
break;
case Z_APDU_presentResponse:
- os << "presentResponse" << " ";
+ os << " " << "presentResponse" << " ";
{
- Z_PresentResponse *pr
+ Z_PresentResponse *pr
= zapdu.u.presentResponse;
- if (!*(pr->presentStatus))
- os << "OK" << " "
- //<< "-" << " "
- //<< pr->referenceId << " "
- << *(pr->numberOfRecordsReturned) << " "
- << *(pr->nextResultSetPosition);
+ if (!pr->presentStatus)
+ os << "Unknown";
else
- if (pr->records)
- os << "DIAG " << *(pr->records);
- else
- os << "ERROR";
-
- //os << "DIAG" << " "
- //<< "-" << " "
- //<< pr->referenceId << " "
- //<< *(pr->numberOfRecordsReturned) << " "
- //<< *(pr->nextResultSetPosition);
+ {
+ switch (*pr->presentStatus)
+ {
+ case Z_PresentStatus_success:
+ os << "OK"; break;
+ case Z_PresentStatus_partial_1:
+ os << "Partial-1"; break;
+ case Z_PresentStatus_partial_2:
+ os << "Partial-2"; break;
+ case Z_PresentStatus_partial_3:
+ os << "Partial-3"; break;
+ case Z_PresentStatus_partial_4:
+ os << "Partial-4"; break;
+ case Z_PresentStatus_failure:
+ os << "Failure"; break;
+ default:
+ os << "Unknown"; break;
+ }
+ }
+ if (pr->records && pr->records->which != Z_Records_DBOSD)
+ os << " DIAG " << *pr->records;
+ else
+ {
+ dump_opt_int(os, pr->numberOfRecordsReturned);
+ dump_opt_int(os, pr->nextResultSetPosition);
+ }
}
break;
case Z_APDU_deleteResultSetRequest:
- os << "deleteResultSetRequest";
+ os << " " << "deleteResultSetRequest";
break;
case Z_APDU_deleteResultSetResponse:
- os << "deleteResultSetResponse";
+ os << " " << "deleteResultSetResponse";
break;
case Z_APDU_accessControlRequest:
- os << "accessControlRequest";
+ os << " " << "accessControlRequest";
break;
case Z_APDU_accessControlResponse:
- os << "accessControlResponse";
+ os << " " << "accessControlResponse";
break;
case Z_APDU_resourceControlRequest:
- os << "resourceControlRequest";
+ os << " " << "resourceControlRequest";
break;
case Z_APDU_resourceControlResponse:
- os << "resourceControlResponse";
+ os << " " << "resourceControlResponse";
break;
case Z_APDU_triggerResourceControlRequest:
- os << "triggerResourceControlRequest";
+ os << " " << "triggerResourceControlRequest";
break;
case Z_APDU_resourceReportRequest:
- os << "resourceReportRequest";
+ os << " " << "resourceReportRequest";
break;
case Z_APDU_resourceReportResponse:
- os << "resourceReportResponse";
+ os << " " << "resourceReportResponse";
break;
case Z_APDU_scanRequest:
- os << "scanRequest" << " ";
- {
- Z_ScanRequest *sr
- = zapdu.u.scanRequest;
-
- for (int i = 0; i < sr->num_databaseNames; i++)
+ os << " " << "scanRequest" << " ";
+ {
+ Z_ScanRequest *sr = zapdu.u.scanRequest;
+
+ if (sr)
{
- os << sr->databaseNames[i];
- if (i+1 == sr->num_databaseNames)
- os << " ";
+ for (int i = 0; i < sr->num_databaseNames; i++)
+ {
+ os << sr->databaseNames[i];
+ if (i+1 != sr->num_databaseNames)
+ os << "+";
+ }
+ dump_opt_int(os, sr->numberOfTermsRequested);
+ dump_opt_int(os, sr->preferredPositionInResponse);
+ dump_opt_int(os, sr->stepSize);
+
+ os << " ";
+ if (sr->termListAndStartPoint)
+ {
+ mp::wrbuf wr;
+ yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint,
+ sr->attributeSet);
+ os << wrbuf_cstr(wr);
+ }
else
- os << "+";
+ os << "-";
}
-
- os << *(sr->numberOfTermsRequested) << " "
- << *(sr->preferredPositionInResponse) << " "
- << *(sr->stepSize) << " ";
-
- WRBUF wr = wrbuf_alloc();
- yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, VAL_NONE);
- os << wrbuf_buf(wr);
- wrbuf_free(wr, 1);
}
break;
case Z_APDU_scanResponse:
- os << "scanResponse" << " ";
+ os << " " << "scanResponse" << " ";
{
- Z_ScanResponse *sr
- = zapdu.u.scanResponse;
- if (!*(sr->scanStatus))
- os << "OK" << " "
- //<< *(sr->scanStatus) << " "
- << *(sr->numberOfEntriesReturned) << " "
- //<< sr->referenceId << " "
- << *(sr->positionOfTerm) << " "
- << *(sr->stepSize) << " ";
- else {
- os << "ERROR" << " "
- << *(sr->scanStatus) << " ";
-
- switch (*(sr->scanStatus)){
- case Z_Scan_success:
- os << "success ";
- break;
- case Z_Scan_partial_1:
- os << "partial_1";
- break;
- case Z_Scan_partial_2:
- os << "partial_2";
- break;
- case Z_Scan_partial_3:
- os << "partial_3";
+ Z_ScanResponse *sr = zapdu.u.scanResponse;
+ if (sr)
+ {
+ if (!sr->scanStatus)
+ os << "OK";
+ else
+ {
+ switch (*sr->scanStatus)
+ {
+ case Z_Scan_success:
+ os << "OK";
break;
- case Z_Scan_partial_4:
- os << "partial_4";
- break;
- case Z_Scan_partial_5:
- os << "partial_5";
- break;
- case Z_Scan_failure:
- os << "failure";
- break;
- default:
- os << "unknown";
+ case Z_Scan_partial_1:
+ os << "partial_1";
+ break;
+ case Z_Scan_partial_2:
+ os << "partial_2";
+ break;
+ case Z_Scan_partial_3:
+ os << "partial_3";
+ break;
+ case Z_Scan_partial_4:
+ os << "partial_4";
+ break;
+ case Z_Scan_partial_5:
+ os << "partial_5";
+ break;
+ case Z_Scan_failure:
+ os << "failure";
+ break;
+ default:
+ os << "unknown";
+ }
}
-
- os << " " << *(sr->numberOfEntriesReturned);
+ dump_opt_int(os, sr->numberOfEntriesReturned);
+ dump_opt_int(os, sr->positionOfTerm);
+ dump_opt_int(os, sr->stepSize);
}
}
break;
case Z_APDU_sortRequest:
- os << "sortRequest" << " ";
+ os << " " << "sortRequest" << " ";
break;
case Z_APDU_sortResponse:
- os << "sortResponse" << " ";
+ os << " " << "sortResponse" << " ";
break;
case Z_APDU_segmentRequest:
- os << "segmentRequest" << " ";
+ os << " " << "segmentRequest" << " ";
break;
case Z_APDU_extendedServicesRequest:
- os << "extendedServicesRequest" << " ";
- {
- Z_ExtendedServicesRequest *er
+ os << " " << "extendedServicesRequest";
+ {
+ Z_ExtendedServicesRequest *er
= zapdu.u.extendedServicesRequest;
-
- switch(*(er->function))
+ if (er)
{
- case Z_ExtendedServicesRequest_create:
- os << "create";
- break;
- case Z_ExtendedServicesRequest_delete:
- os << "delete";
- break;
- case Z_ExtendedServicesRequest_modify:
- os << "modify";
- break;
- default:
- os << "unknown";
- }
+ if (er->function)
+ {
+ os << " ";
+ switch(*(er->function))
+ {
+ case Z_ExtendedServicesRequest_create:
+ os << "create";
+ break;
+ case Z_ExtendedServicesRequest_delete:
+ os << "delete";
+ break;
+ case Z_ExtendedServicesRequest_modify:
+ os << "modify";
+ break;
+ default:
+ os << "unknown";
+ }
+ }
+ else
+ os << " -";
- if (er->userId)
- os << " " << er->userId ;
- else
- os << " " << "--";
- if (er->packageName)
- os << " " << er->packageName;
- else
- os << " " << "--";
+ if (er->userId)
+ os << " " << er->userId ;
+ else
+ os << " -";
- if (er->description)
- os << " " << er->description;
- else
- os << " " << "--";
+ if (er->packageName)
+ os << " " << er->packageName;
+ else
+ os << " -";
+
+ if (er->description)
+ os << " " << er->description;
+ else
+ os << " -";
+ }
}
break;
case Z_APDU_extendedServicesResponse:
- os << "extendedServicesResponse" << " ";
- {
- Z_ExtendedServicesResponse *er
- = zapdu.u.extendedServicesResponse;
-
- switch (*(er->operationStatus)){
- case Z_ExtendedServicesResponse_done:
- os << "OK";
- break;
- case Z_ExtendedServicesResponse_accepted:
- os << "ACCEPT";
- break;
- case Z_ExtendedServicesResponse_failure:
- if (er->num_diagnostics)
- os << "DIAG " << **(er->diagnostics);
- else
- os << "ERROR";
- break;
- default:
- os << "unknown";
- }
- }
+ os << " " << "extendedServicesResponse";
+ {
+ Z_ExtendedServicesResponse *er
+ = zapdu.u.extendedServicesResponse;
+ if (er)
+ {
+ if (er->operationStatus)
+ {
+ os << " ";
+ switch (*er->operationStatus)
+ {
+ case Z_ExtendedServicesResponse_done:
+ os << "OK";
+ break;
+ case Z_ExtendedServicesResponse_accepted:
+ os << "ACCEPT";
+ break;
+ case Z_ExtendedServicesResponse_failure:
+ if (er->num_diagnostics)
+ os << "DIAG " << **(er->diagnostics);
+ else
+ os << "ERROR";
+ break;
+ default:
+ os << "unknown";
+ }
+ }
+ else
+ os << " -";
+ }
+ }
break;
case Z_APDU_close:
- os << "close" << " ";
- {
- Z_Close *c
- = zapdu.u.close;
-
- os << *(c->closeReason) << " ";
- switch (*(c->closeReason)) {
- case Z_Close_finished:
- os << "finished";
- break;
- case Z_Close_shutdown:
- os << "shutdown";
- break;
- case Z_Close_systemProblem:
- os << "systemProblem";
- break;
- case Z_Close_costLimit:
- os << "costLimit";
- break;
- case Z_Close_resources:
- os << "resources";
- break;
- case Z_Close_securityViolation:
- os << "securityViolation";
- break;
- case Z_Close_protocolError:
- os << "protocolError";
- break;
- case Z_Close_lackOfActivity:
- os << "";
- break;
- case Z_Close_peerAbort:
- os << "peerAbort";
- break;
- case Z_Close_unspecified:
- os << "unspecified";
- break;
- default:
- os << "unknown";
- break;
+ os << " " << "close" << " ";
+ {
+ Z_Close *c = zapdu.u.close;
+ if (c)
+ {
+ if (c->closeReason)
+ {
+ os << *(c->closeReason) << " ";
+
+ switch (*c->closeReason)
+ {
+ case Z_Close_finished:
+ os << "finished";
+ break;
+ case Z_Close_shutdown:
+ os << "shutdown";
+ break;
+ case Z_Close_systemProblem:
+ os << "systemProblem";
+ break;
+ case Z_Close_costLimit:
+ os << "costLimit";
+ break;
+ case Z_Close_resources:
+ os << "resources";
+ break;
+ case Z_Close_securityViolation:
+ os << "securityViolation";
+ break;
+ case Z_Close_protocolError:
+ os << "protocolError";
+ break;
+ case Z_Close_lackOfActivity:
+ os << "lackOfActivity";
+ break;
+ case Z_Close_peerAbort:
+ os << "peerAbort";
+ break;
+ case Z_Close_unspecified:
+ os << "unspecified";
+ break;
+ default:
+ os << "unknown";
+ }
+ }
+
+ if (c->diagnosticInformation)
+ os << " " << c->diagnosticInformation;
}
}
break;
case Z_APDU_duplicateDetectionRequest:
- os << "duplicateDetectionRequest";
+ os << " " << "duplicateDetectionRequest";
break;
case Z_APDU_duplicateDetectionResponse:
- os << "duplicateDetectionResponse";
+ os << " " << "duplicateDetectionResponse";
break;
- default:
- os << "Z_APDU "
- << "UNKNOWN";
+ default:
+ os << " " << "Z_APDU " << "UNKNOWN";
}
return os;
}
+
+
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / metaproxy-moved-to-github.git / blobdiff