+void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num)
+{
+ int i;
+ for (i = 0; i<num; i++)
+ {
+ oident *ent;
+ Z_DefaultDiagFormat *r;
+ Z_DiagRec *p = pp[i];
+ if (p->which != Z_DiagRec_defaultFormat)
+ {
+ yaz_log(LOG_LOG, "%sError no diagnostics", m_session_str);
+ return;
+ }
+ else
+ r = p->u.defaultFormat;
+ if (!(ent = oid_getentbyoid(r->diagnosticSetId)) ||
+ ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1)
+ yaz_log(LOG_LOG, "%sError unknown diagnostic set", m_session_str);
+ switch (r->which)
+ {
+ case Z_DefaultDiagFormat_v2Addinfo:
+ yaz_log(LOG_LOG, "%sError %d %s:%s",
+ m_session_str,
+ *r->condition, diagbib1_str(*r->condition),
+ r->u.v2Addinfo);
+ break;
+ case Z_DefaultDiagFormat_v3Addinfo:
+ yaz_log(LOG_LOG, "%sError %d %s:%s",
+ m_session_str,
+ *r->condition, diagbib1_str(*r->condition),
+ r->u.v3Addinfo);
+ break;
+ }
+ }
+}
+
+void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p)
+{
+ int i;
+
+ yaz_marc_t mt = yaz_marc_create();
+ yaz_marc_xml(mt, YAZ_MARC_MARCXML);
+ for (i = 0; i < p->num_records; i++)
+ {
+ Z_NamePlusRecord *npr = p->records[i];
+ if (npr->which == Z_NamePlusRecord_databaseRecord)
+ {
+ Z_External *r = npr->u.databaseRecord;
+ if (r->which == Z_External_octet)
+ {
+ int rlen;
+ char *result;
+ if (yaz_marc_decode_buf(mt, (char*) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len,
+ &result, &rlen))
+ {
+ yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8");
+ WRBUF wrbuf = wrbuf_alloc();
+
+ char outbuf[120];
+ size_t inbytesleft = rlen;
+ const char *inp = result;
+ while (cd && inbytesleft)
+ {
+ size_t outbytesleft = sizeof(outbuf);
+ char *outp = outbuf;
+ size_t r;
+
+ r = yaz_iconv (cd, (char**) &inp,
+ &inbytesleft,
+ &outp, &outbytesleft);
+ if (r == (size_t) (-1))
+ {
+ int e = yaz_iconv_error(cd);
+ if (e != YAZ_ICONV_E2BIG)
+ {
+ yaz_log(LOG_WARN, "conversion failure");
+ break;
+ }
+ }
+ wrbuf_write(wrbuf, outbuf, outp - outbuf);
+ }
+ if (cd)
+ yaz_iconv_close(cd);
+
+ npr->u.databaseRecord = z_ext_record(odr_encode(),
+ VAL_TEXT_XML,
+ wrbuf_buf(wrbuf),
+ wrbuf_len(wrbuf));
+ wrbuf_free(wrbuf, 1);
+ }
+ }
+ }
+ }
+ yaz_marc_destroy(mt);
+}
+
+int Yaz_Proxy::send_to_client(Z_APDU *apdu)
+{
+ int len = 0;
+ if (apdu->which == Z_APDU_searchResponse)
+ {
+ Z_SearchResponse *sr = apdu->u.searchResponse;
+ Z_Records *p = sr->records;
+ if (p && p->which == Z_Records_NSD)
+ {
+ Z_DiagRec dr, *dr_p = &dr;
+ dr.which = Z_DiagRec_defaultFormat;
+ dr.u.defaultFormat = p->u.nonSurrogateDiagnostic;
+
+ display_diagrecs(&dr_p, 1);
+ }
+ else
+ {
+ if (m_marcxml_flag && p && p->which == Z_Records_DBOSD)
+ convert_to_marcxml(p->u.databaseOrSurDiagnostics);
+ if (sr->resultCount)
+ {
+ yaz_log(LOG_LOG, "%s%d hits", m_session_str,
+ *sr->resultCount);
+ if (*sr->resultCount < 0)
+ m_invalid_session = 1;
+ }
+ }
+ }
+ else if (apdu->which == Z_APDU_presentResponse)
+ {
+ Z_PresentResponse *sr = apdu->u.presentResponse;
+ Z_Records *p = sr->records;
+ if (p && p->which == Z_Records_NSD)
+ {
+ Z_DiagRec dr, *dr_p = &dr;
+ dr.which = Z_DiagRec_defaultFormat;
+ dr.u.defaultFormat = p->u.nonSurrogateDiagnostic;
+
+ display_diagrecs(&dr_p, 1);
+ }
+ if (m_marcxml_flag && p && p->which == Z_Records_DBOSD)
+ convert_to_marcxml(p->u.databaseOrSurDiagnostics);
+ }
+ int r = send_Z_PDU(apdu, &len);
+ yaz_log (LOG_DEBUG, "%sSending %s to client %d bytes", m_session_str,
+ apdu_name(apdu), len);
+ m_bytes_sent += len;
+ m_bw_stat.add_bytes(len);
+ return r;
+}
+
+int Yaz_ProxyClient::send_to_target(Z_APDU *apdu)
+{
+ int len = 0;
+ int r = send_Z_PDU(apdu, &len);
+ yaz_log (LOG_LOG, "%sSending %s to %s %d bytes",
+ get_session_str(),
+ apdu_name(apdu), get_hostname(), len);
+ m_bytes_sent += len;
+ return r;
+}
+