X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fgduutil.cpp;h=4993074b49d3c99312abdd3d61e55e6425ea46a5;hb=575099e940a170b75b8d2caad5e2cafe39ed89bb;hp=c17d98cf0ef30d7553fbc6e2b7deb34edf7aa119;hpb=bcc02fc3f88c8ae65ddf68e98bd882df5d2d5c65;p=metaproxy-moved-to-github.git diff --git a/src/gduutil.cpp b/src/gduutil.cpp index c17d98c..4993074 100644 --- a/src/gduutil.cpp +++ b/src/gduutil.cpp @@ -1,13 +1,26 @@ -/* $Id: gduutil.cpp,v 1.8 2006-09-18 10:25:00 marc Exp $ - Copyright (c) 2005-2006, Index Data. +/* This file is part of Metaproxy. + Copyright (C) 2005-2009 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 +#include #include #include @@ -16,7 +29,10 @@ 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) { @@ -114,52 +130,74 @@ std::ostream& std::operator<<(std::ostream& os, Z_DefaultDiagFormat& ddf) 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(std::ostream& os, const int *i) +{ + os << " "; + if (i) + os << *i; + else + os << "-"; +} + std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu) { switch(zapdu.which) { case Z_APDU_initRequest: - os << " " << "initRequest" << " "; + os << " " << "initRequest"; { 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 vhosts; mp::util::get_vhost_otherinfo(ir->otherInfo, vhosts); if (vhosts.size()){ copy(vhosts.begin(), vhosts.end(), ostream_iterator(os, " ")); } - else - os << "-" << " " ; - - os << (ir->implementationId) << " " - //<< ir->referenceId << " " - << (ir->implementationName) << " " - << (ir->implementationVersion); + else + os << "-" ; + + 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 = zapdu.u.initResponse; if (ir->result && *(ir->result)) - os << "OK" << " " - << (ir->implementationId) << " " - //<< ir->referenceId << " " - << (ir->implementationName) << " " - << (ir->implementationVersion) << " "; + { + 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: @@ -171,39 +209,42 @@ std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu) 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 << "+"; } - + + dump_opt_string(os, sr->resultSetName); + + os << " "; + if (sr->preferredRecordSyntax) + { + char oid_name_str[OID_STR_MAX]; + const char *oid_name = yaz_oid_to_string_buf( + sr->preferredRecordSyntax, 0, oid_name_str); + + os << oid_name; + } + else + os << "-"; + + os << " "; WRBUF wr = wrbuf_alloc(); yaz_query_to_wrbuf(wr, sr->query); - os << wrbuf_buf(wr); - wrbuf_free(wr, 1); + os << wrbuf_cstr(wr); + wrbuf_destroy(wr); } break; case Z_APDU_searchResponse: - os << " " << "searchResponse" << " "; + os << " " << "searchResponse "; { Z_SearchResponse *sr = zapdu.u.searchResponse; if (sr->searchStatus && *(sr->searchStatus)) { os << "OK"; - if (sr->resultCount) - os << " " << *(sr->resultCount); - else - os << " -"; - //<< sr->referenceId << " " - if (sr->numberOfRecordsReturned) - os << " " << *(sr->numberOfRecordsReturned); - else - os << " -"; - if (sr->nextResultSetPosition) - os << " " << *(sr->nextResultSetPosition); - else - os << " -"; + dump_opt_int(os, sr->resultCount); + dump_opt_int(os, sr->numberOfRecordsReturned); + dump_opt_int(os, sr->nextResultSetPosition); } else if (sr->records) @@ -213,13 +254,26 @@ std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu) } 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(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: @@ -291,33 +345,24 @@ std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu) for (int i = 0; i < sr->num_databaseNames; i++) { os << sr->databaseNames[i]; - if (i+1 == sr->num_databaseNames) - os << " "; - else - os << "+"; + if (i+1 != sr->num_databaseNames) + os << "+"; } - if (sr->numberOfTermsRequested) - os << " " << *(sr->numberOfTermsRequested); - else - os << " -"; - if (sr->preferredPositionInResponse) - os << " " << *(sr->preferredPositionInResponse); - else - os << " -"; - if (sr->stepSize) - os << " " << *(sr->stepSize); - else - os << " -"; - + dump_opt_int(os, sr->numberOfTermsRequested); + dump_opt_int(os, sr->preferredPositionInResponse); + dump_opt_int(os, sr->stepSize); + + os << " "; if (sr->termListAndStartPoint) { WRBUF wr = wrbuf_alloc(); - yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, VAL_NONE); - os << wrbuf_buf(wr); - wrbuf_free(wr, 1); + yaz_scan_to_wrbuf(wr, sr->termListAndStartPoint, + sr->attributeSet); + os << wrbuf_cstr(wr); + wrbuf_destroy(wr); } else - os << " -"; + os << "-"; } } break; @@ -328,61 +373,41 @@ std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu) = zapdu.u.scanResponse; if (sr) { - if ((sr->scanStatus) && !*(sr->scanStatus)) + if (!sr->scanStatus) { os << "OK"; - //<< *(sr->scanStatus) << " " - if (sr->numberOfEntriesReturned) - os << " " << *(sr->numberOfEntriesReturned); - else - os << " -"; - //<< sr->referenceId << " " - if (sr->positionOfTerm) - os << " " << *(sr->positionOfTerm); - else - os << " -"; - if (sr->stepSize) - os << " " << *(sr->stepSize); - else - os << " -"; } - else { - os << "ERROR"; - if (sr->scanStatus) - { - os << " " << *(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"; - 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"; - } + else + { + switch (*(sr->scanStatus)){ + case Z_Scan_success: + os << "OK"; + 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"; + 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"; } - if (sr->numberOfEntriesReturned) - os << " " << *(sr->numberOfEntriesReturned); - else - os << " -"; } + dump_opt_int(os, sr->numberOfEntriesReturned); + dump_opt_int(os, sr->positionOfTerm); + dump_opt_int(os, sr->stepSize); } } break; @@ -539,11 +564,14 @@ std::ostream& std::operator<<(std::ostream& os, Z_APDU& zapdu) } + + /* * 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 */ +