-/* $Id: gduutil.cpp,v 1.16 2006-10-05 12:17:24 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: gduutil.cpp,v 1.20 2007-04-13 09:57:51 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
See the LICENSE file for details
*/
#include "util.hpp"
#include <yaz/wrbuf.h>
+#include <yaz/oid_db.h>
#include <yaz/querytowrbuf.h>
#include <iostream>
= zapdu.u.initRequest;
Z_IdAuthentication *a = ir->idAuthentication;
- if (a && a->which == Z_IdAuthentication_idPass )
+ if (a && a->which == Z_IdAuthentication_idPass
+ && a->u.idPass->userId)
os << a->u.idPass->userId << " ";
//<< ":" << a->u.idPass->groupId << " ";
else
else
os << "-" << " " ;
- os << (ir->implementationId) << " "
- //<< ir->referenceId << " "
- << (ir->implementationName) << " "
- << (ir->implementationVersion);
+ if (ir->implementationId)
+ os << (ir->implementationId) << " ";
+ //<< ir->referenceId << " "
+ if (ir->implementationName)
+ os<< (ir->implementationName) << " ";
+ if (ir->implementationVersion)
+ os << (ir->implementationVersion) << " ";
}
break;
case Z_APDU_initResponse:
{
Z_InitResponse *ir
= zapdu.u.initResponse;
- if (ir->result && *(ir->result))
- os << "OK" << " "
- << (ir->implementationId) << " "
+ if (ir->result && *(ir->result)){
+ os << "OK" << " ";
+ if (ir->implementationId)
+ os << (ir->implementationId) << " ";
//<< ir->referenceId << " "
- << (ir->implementationName) << " "
- << (ir->implementationVersion) << " ";
+ if (ir->implementationName)
+ os<< (ir->implementationName) << " ";
+ if (ir->implementationVersion)
+ os << (ir->implementationVersion) << " ";
+ }
else
os << "DIAG";
}
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:
else
os << " -";
if (pr->preferredRecordSyntax)
- //os << " " << pr->preferredRecordSyntax;
- os << " " <<(oid_getentbyoid(pr->preferredRecordSyntax))->desc;
+ {
+ 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 (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 << " -";