switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
- yaz_log(YLOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v2Addinfo);
break;
case Z_DefaultDiagFormat_v3Addinfo:
- yaz_log(YLOG_LOG, "%sError %d %s:%s",
+ yaz_log(YLOG_LOG, "%sError " ODR_INT_PRINTF " %s:%s",
m_session_str,
*r->condition, diagbib1_str(*r->condition),
r->u.v3Addinfo);
}
if (sr->resultCount)
{
- yaz_log(YLOG_LOG, "%s%d hits", m_session_str,
+ yaz_log(YLOG_LOG, "%s" ODR_INT_PRINTF " hits", m_session_str,
*sr->resultCount);
if (*sr->resultCount < 0)
{
{
Z_Records *rec = (Z_Records *)
odr_malloc (odr, sizeof(*rec));
- int *err = (int *)
+ Odr_int *err = (Odr_int *)
odr_malloc (odr, sizeof(*err));
Z_DiagRec *drec = (Z_DiagRec *)
odr_malloc (odr, sizeof(*drec));
m_s2z_stylesheet = 0;
Z_IdAuthentication *auth = NULL;
- if (srw_pdu->username && srw_pdu->password)
+ if (srw_pdu->username && !srw_pdu->password)
+ {
+ yaz_log(YLOG_LOG, "username: %s\n", srw_pdu->username);
+ auth = (Z_IdAuthentication *) odr_malloc(m_s2z_odr_init, sizeof(Z_IdAuthentication));
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = odr_strdup(m_s2z_odr_init, srw_pdu->username);
+ }
+ else if (srw_pdu->username && srw_pdu->password)
{
yaz_log(YLOG_LOG, "username/password: %s/%s\n",
srw_pdu->username, srw_pdu->password);