/*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.75 2004-01-05 09:31:09 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.79 2004-01-07 11:37:45 adam Exp $
*/
#include <assert.h>
m_config = 0;
m_marcxml_flag = 0;
m_stylesheet = 0;
+ m_schema = 0;
m_initRequest_apdu = 0;
m_initRequest_mem = 0;
m_apdu_invalid_session = 0;
xfree (m_proxy_authentication);
xfree (m_optimize);
xfree (m_stylesheet);
+ xfree (m_schema);
if (m_s2z_odr_init)
odr_destroy(m_s2z_odr_init);
if (m_s2z_odr_search)
oident *ent = oid_getentbyoid(r->direct_reference);
if (r->which == Z_External_octet && ent->value == VAL_TEXT_XML)
{
- srw_res->records[i].recordSchema = "http://www.loc.gov/marcxml/";
+ srw_res->records[i].recordSchema = m_schema;
srw_res->records[i].recordPacking = m_s2z_packing;
srw_res->records[i].recordData_buf = (char*)
r->u.octet_aligned->buf;
int Yaz_ProxyClient::send_to_target(Z_APDU *apdu)
{
int len = 0;
+ const char *apdu_name_tmp = apdu_name(apdu);
int r = send_Z_PDU(apdu, &len);
if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER)
yaz_log (LOG_LOG, "%sSending %s to %s %d bytes",
get_session_str(),
- apdu_name(apdu), get_hostname(), len);
+ apdu_name_tmp, get_hostname(), len);
m_bytes_sent += len;
return r;
}
{
Z_RPNQuery *rpnquery = 0;
Z_SearchRequest *sr = apdu->u.searchRequest;
+ char *addinfo = 0;
yaz_log(LOG_LOG, "%sCQL: %s", m_session_str,
sr->query->u.type_104->u.cql);
int r = m_cql2rpn.query_transform(sr->query->u.type_104->u.cql,
- &rpnquery, odr_encode());
+ &rpnquery, odr_encode(),
+ &addinfo);
if (r == -3)
yaz_log(LOG_LOG, "%sNo CQL to RPN table", m_session_str);
else if (r)
+ {
yaz_log(LOG_LOG, "%sCQL Conversion error %d", m_session_str, r);
+ Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
+
+ new_apdu->u.searchResponse->referenceId = sr->referenceId;
+ new_apdu->u.searchResponse->records =
+ create_nonSurrogateDiagnostics(odr_encode(),
+ yaz_diag_srw_to_bib1(r),
+ addinfo);
+ *new_apdu->u.searchResponse->searchStatus = 0;
+
+ send_to_client(new_apdu);
+
+ return 0;
+ }
else
{
sr->query->which = Z_Query_type_1;
err = cfg->check_syntax(odr_encode(),
m_default_target,
sr->preferredRecordSyntax, rc,
- &addinfo, &m_stylesheet);
+ &addinfo, &m_stylesheet, &m_schema);
if (err == -1)
{
sr->preferredRecordSyntax =
err = cfg->check_syntax(odr_encode(), m_default_target,
pr->preferredRecordSyntax,
pr->recordComposition,
- &addinfo, &m_stylesheet);
+ &addinfo, &m_stylesheet, &m_schema);
if (err == -1)
{
pr->preferredRecordSyntax =
start = *srw_req->startRecord;
if (max > 0)
{
- if (start <= 1) // Z39.50 piggyback
+ // Some backend, such as Voyager doesn't honor piggyback
+ // So we use present always (0 &&).
+ if (0 && start <= 1) // Z39.50 piggyback
{
*z_searchRequest->smallSetUpperBound = max;
*z_searchRequest->mediumSetPresentNumber = max;
int r = Yaz_Z_Assoc::server(addr);
if (!r)
{
- yaz_log(LOG_LOG, "%sStarted listener on %s", m_session_str, addr);
+ yaz_log(LOG_LOG, "%sStarted proxy " VERSION " on %s", m_session_str, addr);
timeout(1);
}
return r;