* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.93 2004-01-30 00:38:28 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.102 2004-02-16 10:47:37 adam Exp $
*/
#include <assert.h>
#include <yaz++/proxy.h>
#include <yaz/pquery.h>
-#if HAVE_XSLT
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-#endif
-
static const char *apdu_name(Z_APDU *apdu)
{
switch (apdu->which)
m_optimize = xstrdup ("1");
strcpy(m_session_str, "0 ");
m_session_no=0;
- m_bytes_sent = m_bytes_recv = 0;
+ m_bytes_sent = 0;
+ m_bytes_recv = 0;
m_bw_hold_PDU = 0;
m_bw_max = 0;
m_pdu_max = 0;
m_config_fname = 0;
m_request_no = 0;
m_invalid_session = 0;
+ m_referenceId = 0;
+ m_referenceId_mem = nmem_create();
m_config = 0;
m_marcxml_flag = 0;
- m_stylesheet_schema = 0;
+ m_stylesheet_xsp = 0;
+ m_stylesheet_nprl = 0;
m_s2z_stylesheet = 0;
m_s2z_database = 0;
m_schema = 0;
m_bytes_sent, m_bytes_recv);
nmem_destroy(m_initRequest_mem);
nmem_destroy(m_mem_invalid_session);
+ nmem_destroy(m_referenceId_mem);
+
xfree (m_proxyTarget);
xfree (m_default_target);
xfree (m_proxy_authentication);
xfree (m_optimize);
- xfree (m_stylesheet_schema);
+
+ if (m_stylesheet_xsp)
+ xsltFreeStylesheet(m_stylesheet_xsp);
+
xfree (m_schema);
if (m_s2z_odr_init)
odr_destroy(m_s2z_odr_init);
}
}
-void Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p)
+int Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p, Z_APDU *apdu)
{
- if (!m_stylesheet_schema)
- return;
- xsltStylesheetPtr xsp;
+ if (!m_stylesheet_xsp || p->num_records <= 0)
+ return 0; /* no XSLT to be done ... */
- xsp = xsltParseStylesheetFile((const xmlChar *) m_stylesheet_schema);
+ m_stylesheet_offset = 0;
+ m_stylesheet_nprl = p;
+ m_stylesheet_apdu = apdu;
+ timeout(0);
+ return 1;
+}
- int i;
- for (i = 0; i < p->num_records; i++)
+void Yaz_Proxy::convert_xsl_delay()
+{
+ Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
+ if (npr->which == Z_NamePlusRecord_databaseRecord)
{
- Z_NamePlusRecord *npr = p->records[i];
- if (npr->which == Z_NamePlusRecord_databaseRecord)
+ Z_External *r = npr->u.databaseRecord;
+ if (r->which == Z_External_octet)
{
- Z_External *r = npr->u.databaseRecord;
- if (r->which == Z_External_octet)
+ xmlDocPtr res, doc = xmlParseMemory(
+ (char*) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
+
+ yaz_log(LOG_LOG, "%sXSLT convert %d",
+ m_session_str, m_stylesheet_offset);
+ res = xsltApplyStylesheet(m_stylesheet_xsp, doc, 0);
+ if (res)
{
- xmlDocPtr res, doc = xmlParseMemory(
- (char*) r->u.octet_aligned->buf,
- r->u.octet_aligned->len);
-
- res = xsltApplyStylesheet(xsp, doc, 0);
-
xmlChar *out_buf;
int out_len;
xmlDocDumpFormatMemory (res, &out_buf, &out_len, 1);
-
- p->records[i]->u.databaseRecord =
+
+ m_stylesheet_nprl->records[m_stylesheet_offset]->
+ u.databaseRecord =
z_ext_record(odr_encode(), VAL_TEXT_XML,
(char*) out_buf, out_len);
xmlFree(out_buf);
- xmlFreeDoc(doc);
xmlFreeDoc(res);
}
+ xmlFreeDoc(doc);
}
}
- xsltFreeStylesheet(xsp);
+ m_stylesheet_offset++;
+ if (m_stylesheet_offset == m_stylesheet_nprl->num_records)
+ {
+ m_stylesheet_nprl = 0;
+ if (m_stylesheet_xsp)
+ xsltFreeStylesheet(m_stylesheet_xsp);
+ m_stylesheet_xsp = 0;
+ timeout(m_client_idletime);
+ send_PDU_convert(m_stylesheet_apdu);
+ }
+ else
+ timeout(0);
}
void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p)
}
int len;
int r = send_GDU(gdu, &len);
+ m_bytes_sent += len;
+ m_bw_stat.add_bytes(len);
logtime();
return r;
}
}
int len;
int r = send_GDU(gdu, &len);
+ m_bytes_sent += len;
+ m_bw_stat.add_bytes(len);
logtime();
return r;
}
er->record.recordData_buf = b;
er->record.recordData_len = len;
er->record.recordPacking = m_s2z_packing;
+ er->record.recordSchema = "http://explain.z3950.org/dtd/2.0/";
er->diagnostics = diagnostics;
er->num_diagnostics = num_diagnostics;
return send_http_response(404);
}
-int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len)
+int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu)
{
if (m_http_version)
{
}
else
{
+ int len = 0;
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
apdu_name(apdu));
- int r = send_Z_PDU(apdu, len);
+ int r = send_Z_PDU(apdu, &len);
+ m_bytes_sent += len;
+ m_bw_stat.add_bytes(len);
logtime();
return r;
}
int Yaz_Proxy::send_to_client(Z_APDU *apdu)
{
- int len = 0;
int kill_session = 0;
+ Z_ReferenceId **new_id = get_referenceIdP(apdu);
+
+ if (new_id && m_referenceId)
+ *new_id = m_referenceId;
+
if (apdu->which == Z_APDU_searchResponse)
{
Z_SearchResponse *sr = apdu->u.searchResponse;
{
if (m_marcxml_flag)
convert_to_marcxml(p->u.databaseOrSurDiagnostics);
- convert_xsl(p->u.databaseOrSurDiagnostics);
+ if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu))
+ return 0;
+
}
if (sr->resultCount)
{
{
if (m_marcxml_flag)
convert_to_marcxml(p->u.databaseOrSurDiagnostics);
- convert_xsl(p->u.databaseOrSurDiagnostics);
+ if (convert_xsl(p->u.databaseOrSurDiagnostics, apdu))
+ return 0;
}
}
else if (apdu->which == Z_APDU_initResponse)
apdu->u.initResponse->protocolVersion = nopt;
}
}
- int r = send_PDU_convert(apdu, &len);
+ int r = send_PDU_convert(apdu);
if (r)
return r;
- m_bytes_sent += len;
- m_bw_stat.add_bytes(len);
if (kill_session)
{
delete m_client;
rc_temp.u.simple = sr->smallSetElementSetNames;
rc = &rc_temp;
}
-
+
+ char *stylesheet_name = 0;
if (cfg)
err = cfg->check_syntax(odr_encode(),
m_default_target,
sr->preferredRecordSyntax, rc,
- &addinfo, &m_stylesheet_schema, &m_schema);
+ &addinfo, &stylesheet_name, &m_schema);
+ if (stylesheet_name)
+ {
+ if (m_stylesheet_xsp)
+ xsltFreeStylesheet(m_stylesheet_xsp);
+ m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
+ stylesheet_name);
+ m_stylesheet_offset = 0;
+ xfree(stylesheet_name);
+ }
if (err == -1)
{
sr->preferredRecordSyntax =
char *addinfo = 0;
Yaz_ProxyConfig *cfg = check_reconfigure();
+ char *stylesheet_name = 0;
if (cfg)
err = cfg->check_syntax(odr_encode(), m_default_target,
pr->preferredRecordSyntax,
pr->recordComposition,
- &addinfo, &m_stylesheet_schema, &m_schema);
+ &addinfo, &stylesheet_name, &m_schema);
+ if (stylesheet_name)
+ {
+ if (m_stylesheet_xsp)
+ xsltFreeStylesheet(m_stylesheet_xsp);
+ m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
+ stylesheet_name);
+ m_stylesheet_offset = 0;
+ xfree(stylesheet_name);
+ }
if (err == -1)
{
pr->preferredRecordSyntax =
z_presentRequest->preferredRecordSyntax =
yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN,
VAL_TEXT_XML);
- z_presentRequest->recordComposition =
- (Z_RecordComposition *)
- odr_malloc(m_s2z_odr_search,
- sizeof(Z_RecordComposition));
if (srw_req->recordSchema)
{
+ z_presentRequest->recordComposition =
+ (Z_RecordComposition *)
+ odr_malloc(m_s2z_odr_search,
+ sizeof(Z_RecordComposition));
z_presentRequest->recordComposition->which =
Z_RecordComp_simple;
z_presentRequest->recordComposition->u.simple =
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
{
+ Z_ReferenceId **refid = get_referenceIdP(apdu);
+ nmem_reset(m_referenceId_mem);
+ if (refid && *refid)
+ {
+ m_referenceId = (Z_ReferenceId *)
+ nmem_malloc(m_referenceId_mem, sizeof(*m_referenceId));
+ m_referenceId->len = m_referenceId->size = (*refid)->len;
+ m_referenceId->buf = (unsigned char *)
+ nmem_malloc(m_referenceId_mem, (*refid)->len);
+ memcpy(m_referenceId->buf, (*refid)->buf, (*refid)->len);
+ }
+ else
+ m_referenceId = 0;
+
if (!m_client && m_invalid_session)
{
m_apdu_invalid_session = apdu;
m_mem_invalid_session = odr_extract_mem(odr_decode());
apdu = m_initRequest_apdu;
}
-
+
// Determine our client.
Z_OtherInformation **oi;
get_otherInfoAPDU(apdu, &oi);
ODR_MASK_SET(apdu->u.initRequest->options, i);
ODR_MASK_CLEAR(apdu->u.initRequest->options,
Z_Options_negotiationModel);
+ ODR_MASK_CLEAR(apdu->u.initRequest->options,
+ Z_Options_concurrentOperations);
// make new version
m_initRequest_version = apdu->u.initRequest->protocolVersion;
{
if (handle_init_response_for_invalid_session(apdu))
return;
- Z_APDU *apdu2 = m_client->m_initResponse;
- apdu2->u.initResponse->otherInfo = 0;
- if (m_client->m_cookie && *m_client->m_cookie)
- set_otherInformationString(apdu2, VAL_COOKIE, 1,
- 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;
+ if (m_client->m_initResponse)
+ {
+ Z_APDU *apdu2 = m_client->m_initResponse;
+ apdu2->u.initResponse->otherInfo = 0;
+ if (m_client->m_cookie && *m_client->m_cookie)
+ set_otherInformationString(apdu2, VAL_COOKIE, 1,
+ 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;
+ }
}
m_client->m_init_flag = 1;
}
ODR_MASK_SET(req->options, i);
ODR_MASK_CLEAR(apdu->u.initRequest->options,
Z_Options_negotiationModel);
+ ODR_MASK_CLEAR(apdu->u.initRequest->options,
+ Z_Options_concurrentOperations);
for (i = 0; i<= 10; i++)
ODR_MASK_SET(req->protocolVersion, i);
else if (apdu->which == Z_GDU_HTTP_Request)
handle_incoming_HTTP(apdu->u.HTTP_Request);
}
+ else if (m_stylesheet_nprl)
+ convert_xsl_delay();
else
{
inc_request_no();
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len)
{
m_bytes_recv += len;
+
m_pdu_recv++;
m_waiting = 0;
if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER)