* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-my-client.cpp,v 1.22 2006-03-28 19:51:38 adam Exp $
+ * $Id: yaz-my-client.cpp,v 1.25 2007-03-20 07:54:11 adam Exp $
*/
#include <stdlib.h>
#include <yaz/options.h>
#include <yaz/diagbib1.h>
#include <yaz/marcdisp.h>
-#include <yaz++/ir-assoc.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/ir-assoc.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
extern "C" {
#if HAVE_READLINE_READLINE_H
if (!(*etype->fun)(odr_decode(), (char **)&rr, 0, 0))
{
odr_perror(odr_decode(), "Decoding constructed record.");
- fprintf(stderr, "[Near %d]\n", odr_offset(odr_decode()));
+ fprintf(stderr, "[Near %ld]\n", (long) odr_offset(odr_decode()));
fprintf(stderr, "Packet dump:\n---------\n");
odr_dumpBER(stderr, (char*)record->u.octet_aligned->buf,
record->u.octet_aligned->len);
}
if (r->which == Z_External_octet && record->u.octet_aligned->len)
{
+ yaz_marc_t mt = yaz_marc_create();
switch (ent->value)
{
case VAL_ISO2709:
case VAL_SIGLEMARC:
case VAL_ISDSMARC:
case VAL_RUSMARC:
- marc_display((char*) record->u.octet_aligned->buf,0);
+ const char *result_buf;
+ size_t result_size;
+ yaz_marc_decode_buf(mt, (const char *)
+ record->u.octet_aligned->buf,
+ record->u.octet_aligned->len,
+ &result_buf, &result_size);
+ fwrite(result_buf, 1, result_size, stdout);
break;
default:
recv_textRecord((int) ent->value,
(const char *) record->u.octet_aligned->buf,
(size_t) record->u.octet_aligned->len);
}
+ yaz_marc_destroy(mt);
}
else if (ent && ent->value == VAL_SUTRS && r->which == Z_External_sutrs)
recv_textRecord((int) VAL_SUTRS, (const char *) r->u.sutrs->buf,