* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.81 2004-01-07 21:04:10 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.90 2004-01-15 15:47:52 adam Exp $
*/
#include <assert.h>
m_config = 0;
m_marcxml_flag = 0;
m_stylesheet_schema = 0;
+ m_s2z_stylesheet = 0;
m_schema = 0;
m_initRequest_apdu = 0;
m_initRequest_mem = 0;
+ m_initRequest_options = 0;
+ m_initRequest_version = 0;
m_apdu_invalid_session = 0;
m_mem_invalid_session = 0;
m_s2z_odr_init = 0;
{
if (apdu->which != Z_APDU_initRequest)
{
- yaz_log (LOG_LOG, "no first INIT!");
+ yaz_log (LOG_LOG, "%sno init request as first PDU", m_session_str);
return 0;
}
Z_InitRequest *initRequest = apdu->u.initRequest;
odr_strdup (odr_encode(), m_proxy_authentication);
}
}
-
// go through list of clients - and find the lowest/oldest one.
Yaz_ProxyClient *c_min = 0;
int min_seq = -1;
{
if (!m_stylesheet_schema)
return;
- xmlDocPtr xslt_doc = xmlParseFile(m_stylesheet_schema);
xsltStylesheetPtr xsp;
- xsp = xsltParseStylesheetDoc(xslt_doc);
+ xsp = xsltParseStylesheetFile((const xmlChar *) m_stylesheet_schema);
int i;
for (i = 0; i < p->num_records; i++)
xmlChar *out_buf;
int out_len;
- xmlDocDumpMemory (res, &out_buf, &out_len);
+ xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
+
p->records[i]->u.databaseRecord =
z_ext_record(odr_encode(), VAL_TEXT_XML,
(char*) out_buf, out_len);
+ xmlFree(out_buf);
xmlFreeDoc(doc);
xmlFreeDoc(res);
}
soap_package->ns = m_soap_ns;
z_soap_codec_enc_xsl(o, &soap_package,
&hres->content_buf, &hres->content_len,
- soap_handlers, 0, 0);
+ soap_handlers, 0, m_s2z_stylesheet);
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
return r;
}
-int Yaz_Proxy::send_to_srw_client_error(int srw_error)
+int Yaz_Proxy::send_to_srw_client_error(int srw_error, const char *add)
{
ODR o = odr_encode();
Z_SRW_PDU *srw_pdu = yaz_srw_get(o, Z_SRW_searchRetrieve_response);
srw_res->diagnostics = (Z_SRW_diagnostic *)
odr_malloc(o, sizeof(*srw_res->diagnostics));
srw_res->diagnostics[0].code = odr_intdup(o, srw_error);
- srw_res->diagnostics[0].details = 0;
+ srw_res->diagnostics[0].details = add ? odr_strdup(o, add) : 0;
return send_srw_response(srw_pdu);
}
}
-int Yaz_Proxy::send_srw_explain()
+int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
+ int num_diagnostics)
{
Z_SRW_PDU *res = yaz_srw_get(odr_encode(), Z_SRW_explain_response);
Z_SRW_explainResponse *er = res->u.explain_response;
if (cfg)
{
int len;
- assert (m_proxyTarget);
char *b = cfg->get_explain(odr_encode(), 0 /* target */,
0 /* db */, &len);
if (b)
er->record.recordPacking = m_s2z_packing;
}
}
+ er->diagnostics = diagnostics;
+ er->num_diagnostics = num_diagnostics;
return send_srw_response(res);
}
Z_InitResponse *res = apdu->u.initResponse;
if (*res->result == 0)
{
- send_to_srw_client_error(3);
+ send_to_srw_client_error(3, 0);
}
else if (!m_s2z_search_apdu)
{
- send_srw_explain();
+ send_srw_explain_response(0, 0);
}
else
{
{
send_to_srw_client_ok(0, res->records, 1);
}
- else if (m_s2z_present_apdu)
+ else if (m_s2z_present_apdu && m_s2z_hit_count > 0)
{
+ // adjust
+ Z_PresentRequest *pr = m_s2z_present_apdu->u.presentRequest;
+
+ if (*pr->resultSetStartPoint <= m_s2z_hit_count)
+ {
+ if (*pr->numberOfRecordsRequested+ *pr->resultSetStartPoint
+ > m_s2z_hit_count)
+ *pr->numberOfRecordsRequested =
+ 1 + m_s2z_hit_count - *pr->resultSetStartPoint;
+ }
handle_incoming_Z_PDU(m_s2z_present_apdu);
}
else
{
+ m_s2z_present_apdu = 0;
send_to_srw_client_ok(m_s2z_hit_count, res->records, 1);
}
}
convert_xsl(p->u.databaseOrSurDiagnostics);
}
}
+ else if (apdu->which == Z_APDU_initResponse)
+ {
+ if (m_initRequest_options)
+ {
+ Z_Options *nopt =
+ (Odr_bitmask *)odr_malloc(odr_encode(),
+ sizeof(Odr_bitmask));
+ ODR_MASK_ZERO(nopt);
+
+ int i;
+ for (i = 0; i<24; i++)
+ if (ODR_MASK_GET(m_initRequest_options, i) &&
+ ODR_MASK_GET(apdu->u.initResponse->options, i))
+ ODR_MASK_SET(nopt, i);
+ apdu->u.initResponse->options = nopt;
+ }
+ if (m_initRequest_version)
+ {
+ Z_ProtocolVersion *nopt =
+ (Odr_bitmask *)odr_malloc(odr_encode(),
+ sizeof(Odr_bitmask));
+ ODR_MASK_ZERO(nopt);
+
+ int i;
+ for (i = 0; i<8; i++)
+ if (ODR_MASK_GET(m_initRequest_version, i) &&
+ ODR_MASK_GET(apdu->u.initResponse->protocolVersion, i))
+ ODR_MASK_SET(nopt, i);
+ apdu->u.initResponse->protocolVersion = nopt;
+ }
+ }
int r = send_PDU_convert(apdu, &len);
if (r)
return r;
Z_SRW_PDU *srw_pdu = 0;
Z_SOAP *soap_package = 0;
char *charset = 0;
+ Z_SRW_diagnostic *diagnostic = 0;
+ int num_diagnostic = 0;
if (yaz_srw_decode(hreq, &srw_pdu, &soap_package, odr_decode(),
&charset) == 0
|| yaz_sru_decode(hreq, &srw_pdu, &soap_package, odr_decode(),
- &charset) == 0)
+ &charset, &diagnostic, &num_diagnostic) == 0)
{
m_s2z_odr_init = odr_createmem(ODR_ENCODE);
m_s2z_odr_search = odr_createmem(ODR_ENCODE);
m_s2z_init_apdu = 0;
m_s2z_search_apdu = 0;
m_s2z_present_apdu = 0;
+
+ m_s2z_stylesheet = 0;
+
if (srw_pdu->which == Z_SRW_searchRetrieve_request)
{
Z_SRW_searchRetrieveRequest *srw_req = srw_pdu->u.request;
+ // recordXPath unsupported.
+ if (srw_req->recordXPath)
+ {
+ yaz_add_srw_diagnostic(odr_decode(),
+ &diagnostic, &num_diagnostic,
+ 72, 0);
+ }
+ // must have a query
+ if (!srw_req->query.cql)
+ {
+ yaz_add_srw_diagnostic(odr_decode(),
+ &diagnostic, &num_diagnostic,
+ 7, "query");
+ }
+ // sort unsupported
+ if (srw_req->sort_type != Z_SRW_sort_type_none)
+ {
+ yaz_add_srw_diagnostic(odr_decode(),
+ &diagnostic, &num_diagnostic,
+ 80, 0);
+ }
+ // save stylesheet
+ if (srw_req->stylesheet)
+ m_s2z_stylesheet =
+ odr_strdup(m_s2z_odr_init, srw_req->stylesheet);
+
// set packing for response records ..
if (srw_req->recordPacking &&
!strcmp(srw_req->recordPacking, "xml"))
else
m_s2z_packing = Z_SRW_recordPacking_string;
+ if (num_diagnostic)
+ {
+ Z_SRW_PDU *srw_pdu =
+ yaz_srw_get(odr_encode(),
+ Z_SRW_searchRetrieve_response);
+ Z_SRW_searchRetrieveResponse *srw_res = srw_pdu->u.response;
+
+ srw_res->diagnostics = diagnostic;
+ srw_res->num_diagnostics = num_diagnostic;
+ send_srw_response(srw_pdu);
+ return;
+ }
+
// prepare search PDU
m_s2z_search_apdu = zget_APDU(m_s2z_odr_search,
Z_APDU_searchRequest);
yaz_log(LOG_LOG, "%*s^\n", off+4, "");
yaz_log(LOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code);
- send_to_srw_client_error(10);
+ send_to_srw_client_error(10, 0);
return;
}
query->which = Z_Query_type_1;
}
else
{
- send_to_srw_client_error(11);
+ send_to_srw_client_error(7, "query");
return;
}
else if (srw_pdu->which == Z_SRW_explain_request)
{
Z_SRW_explainRequest *srw_req = srw_pdu->u.explain_request;
-
+
+ // save stylesheet
+ if (srw_req->stylesheet)
+ m_s2z_stylesheet =
+ odr_strdup(m_s2z_odr_init, srw_req->stylesheet);
+
if (srw_req->recordPacking &&
!strcmp(srw_req->recordPacking, "xml"))
m_s2z_packing = Z_SRW_recordPacking_XML;
else
m_s2z_packing = Z_SRW_recordPacking_string;
+ if (num_diagnostic)
+ {
+ send_srw_explain_response(diagnostic, num_diagnostic);
+ return;
+ }
+
if (!m_client)
{
- yaz_log(LOG_LOG, "handle_incoming: initRequest");
m_s2z_init_apdu = zget_APDU(m_s2z_odr_init,
Z_APDU_initRequest);
handle_incoming_Z_PDU(m_s2z_init_apdu);
}
else
- send_srw_explain();
+ send_srw_explain_response(0, 0);
return;
}
+ else if (srw_pdu->which == Z_SRW_scan_request)
+ {
+ yaz_add_srw_diagnostic(odr_decode(),
+ &diagnostic, &num_diagnostic,
+ 4, "scan");
+ Z_SRW_PDU *srw_pdu =
+ yaz_srw_get(odr_encode(),
+ Z_SRW_scan_response);
+ Z_SRW_scanResponse *srw_res = srw_pdu->u.scan_response;
+
+ srw_res->diagnostics = diagnostic;
+ srw_res->num_diagnostics = num_diagnostic;
+ send_srw_response(srw_pdu);
+ return;
+ }
+ else
+ {
+ send_to_srw_client_error(4, 0);
+ }
}
int len = 0;
Z_GDU *p = z_get_HTTP_Response(odr_encode(), 400);
nmem_destroy(m_initRequest_mem);
m_initRequest_apdu = apdu;
m_initRequest_mem = odr_extract_mem(odr_decode());
+
+ // save init options for the response..
+ m_initRequest_options = apdu->u.initRequest->options;
+
+ apdu->u.initRequest->options =
+ (Odr_bitmask *)nmem_malloc(m_initRequest_mem,
+ sizeof(Odr_bitmask));
+ ODR_MASK_ZERO(apdu->u.initRequest->options);
+ int i;
+ for (i = 0; i<= 24; i++)
+ ODR_MASK_SET(apdu->u.initRequest->options, i);
+ ODR_MASK_CLEAR(apdu->u.initRequest->options,
+ Z_Options_negotiationModel);
+
+ // make new version
+ m_initRequest_version = apdu->u.initRequest->protocolVersion;
+ apdu->u.initRequest->protocolVersion =
+ (Odr_bitmask *)nmem_malloc(m_initRequest_mem,
+ sizeof(Odr_bitmask));
+ ODR_MASK_ZERO(apdu->u.initRequest->protocolVersion);
+
+ for (i = 0; i<= 8; i++)
+ ODR_MASK_SET(apdu->u.initRequest->protocolVersion, i);
}
if (m_client->m_init_flag)
{
m_client->m_cookie);
apdu2->u.initResponse->referenceId =
apdu->u.initRequest->referenceId;
+ apdu2->u.initResponse->options = m_client->m_initResponse_options;
+ apdu2->u.initResponse->protocolVersion =
+ m_client->m_initResponse_version;
+
send_to_client(apdu2);
return;
}
Z_APDU *apdu = create_Z_PDU(Z_APDU_initRequest);
Z_InitRequest *req = apdu->u.initRequest;
- ODR_MASK_SET(req->options, Z_Options_search);
- ODR_MASK_SET(req->options, Z_Options_present);
- ODR_MASK_SET(req->options, Z_Options_namedResultSets);
- ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl);
- ODR_MASK_SET(req->options, Z_Options_scan);
- ODR_MASK_SET(req->options, Z_Options_sort);
- ODR_MASK_SET(req->options, Z_Options_extendedServices);
- ODR_MASK_SET(req->options, Z_Options_delSet);
-
- ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
- ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
- ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
-
+ int i;
+ for (i = 0; i<= 24; i++)
+ ODR_MASK_SET(req->options, i);
+ ODR_MASK_CLEAR(apdu->u.initRequest->options,
+ Z_Options_negotiationModel);
+ for (i = 0; i<= 10; i++)
+ ODR_MASK_SET(req->protocolVersion, i);
+
if (send_to_target(apdu) < 0)
{
delete this;
}
}
+void Yaz_Proxy::markInvalid()
+{
+ m_client = 0;
+ m_invalid_session = 1;
+}
+
void Yaz_ProxyClient::timeoutNotify()
{
if (m_server)
get_hostname());
m_waiting = 1;
m_root->pre_init();
+ if (m_server && m_init_flag)
+ {
+ // target timed out in a session that was properly initialized
+ // server object stay alive but we mark it as invalid so it
+ // gets initialized again
+ m_server->markInvalid();
+ m_server = 0;
+ }
shutdown();
}
m_waiting = 0;
m_init_odr = odr_createmem (ODR_DECODE);
m_initResponse = 0;
+ m_initResponse_options = 0;
+ m_initResponse_version = 0;
m_resultSetStartPoint = 0;
m_bytes_sent = m_bytes_recv = 0;
m_pdu_recv = 0;
odr_reset (m_init_odr);
nmem_transfer (m_init_odr->mem, nmem);
m_initResponse = apdu;
+ m_initResponse_options = apdu->u.initResponse->options;
+ m_initResponse_version = apdu->u.initResponse->protocolVersion;
Z_InitResponse *ir = apdu->u.initResponse;
char *im0 = ir->implementationName;