projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set referenceId for response PDU to avoid unknown IDs for Voyager target
[yazpp-moved-to-github.git]
/
src
/
yaz-proxy.cpp
diff --git
a/src/yaz-proxy.cpp
b/src/yaz-proxy.cpp
index
2700553
..
0e423d9
100644
(file)
--- a/
src/yaz-proxy.cpp
+++ b/
src/yaz-proxy.cpp
@@
-2,7
+2,7
@@
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy.cpp,v 1.92 2004-01-29 20:53:34 adam Exp $
+ * $Id: yaz-proxy.cpp,v 1.97 2004-02-02 15:11:41 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-16,11
+16,6
@@
#include <yaz++/proxy.h>
#include <yaz/pquery.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)
static const char *apdu_name(Z_APDU *apdu)
{
switch (apdu->which)
@@
-95,7
+90,8
@@
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
m_optimize = xstrdup ("1");
strcpy(m_session_str, "0 ");
m_session_no=0;
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_bw_hold_PDU = 0;
m_bw_max = 0;
m_pdu_max = 0;
@@
-104,9
+100,11
@@
Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable,
m_config_fname = 0;
m_request_no = 0;
m_invalid_session = 0;
m_config_fname = 0;
m_request_no = 0;
m_invalid_session = 0;
+ m_referenceId = 0;
m_config = 0;
m_marcxml_flag = 0;
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_s2z_stylesheet = 0;
m_s2z_database = 0;
m_schema = 0;
@@
-139,7
+137,10
@@
Yaz_Proxy::~Yaz_Proxy()
xfree (m_default_target);
xfree (m_proxy_authentication);
xfree (m_optimize);
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);
xfree (m_schema);
if (m_s2z_odr_init)
odr_destroy(m_s2z_odr_init);
@@
-583,43
+584,61
@@
void Yaz_Proxy::display_diagrecs(Z_DiagRec **pp, int num)
}
}
}
}
-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);
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);
z_ext_record(odr_encode(), VAL_TEXT_XML,
(char*) out_buf, out_len);
xmlFree(out_buf);
- xmlFreeDoc(doc);
xmlFreeDoc(res);
}
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);
+ int r = send_PDU_convert(m_stylesheet_apdu);
+ }
+ else
+ timeout(0);
}
void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p)
}
void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p)
@@
-706,7
+725,11
@@
int Yaz_Proxy::send_http_response(int code)
Z_HTTP_Response *hres = gdu->u.HTTP_Response;
if (m_http_version)
hres->version = odr_strdup(o, m_http_version);
Z_HTTP_Response *hres = gdu->u.HTTP_Response;
if (m_http_version)
hres->version = odr_strdup(o, m_http_version);
- m_http_keepalive = 0;
+ if (m_http_keepalive)
+ z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive");
+ else
+ timeout(0);
+
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
if (m_log_mask & PROXY_LOG_REQ_CLIENT)
{
yaz_log (LOG_LOG, "%sSending %s to client", m_session_str,
@@
-714,6
+737,8
@@
int Yaz_Proxy::send_http_response(int code)
}
int len;
int r = send_GDU(gdu, &len);
}
int len;
int r = send_GDU(gdu, &len);
+ m_bytes_sent += len;
+ m_bw_stat.add_bytes(len);
logtime();
return r;
}
logtime();
return r;
}
@@
-729,6
+754,8
@@
int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu)
z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
if (m_http_keepalive)
z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive");
z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype);
if (m_http_keepalive)
z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive");
+ else
+ timeout(0);
static Z_SOAP_Handler soap_handlers[2] = {
#if HAVE_XSLT
static Z_SOAP_Handler soap_handlers[2] = {
#if HAVE_XSLT
@@
-756,6
+783,8
@@
int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu)
}
int len;
int r = send_GDU(gdu, &len);
}
int len;
int r = send_GDU(gdu, &len);
+ m_bytes_sent += len;
+ m_bw_stat.add_bytes(len);
logtime();
return r;
}
logtime();
return r;
}
@@
-873,7
+902,7
@@
int Yaz_Proxy::send_srw_explain_response(Z_SRW_diagnostic *diagnostics,
return send_http_response(404);
}
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)
{
{
if (m_http_version)
{
@@
-934,10
+963,13
@@
int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len)
}
else
{
}
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));
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;
}
logtime();
return r;
}
@@
-946,8
+978,12
@@
int Yaz_Proxy::send_PDU_convert(Z_APDU *apdu, int *len)
int Yaz_Proxy::send_to_client(Z_APDU *apdu)
{
int Yaz_Proxy::send_to_client(Z_APDU *apdu)
{
- int len = 0;
int kill_session = 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 (apdu->which == Z_APDU_searchResponse)
{
Z_SearchResponse *sr = apdu->u.searchResponse;
@@
-967,7
+1003,9
@@
int Yaz_Proxy::send_to_client(Z_APDU *apdu)
{
if (m_marcxml_flag)
convert_to_marcxml(p->u.databaseOrSurDiagnostics);
{
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 (sr->resultCount)
{
@@
-1003,7
+1041,8
@@
int Yaz_Proxy::send_to_client(Z_APDU *apdu)
{
if (m_marcxml_flag)
convert_to_marcxml(p->u.databaseOrSurDiagnostics);
{
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)
}
}
else if (apdu->which == Z_APDU_initResponse)
@@
-1037,29
+1076,15
@@
int Yaz_Proxy::send_to_client(Z_APDU *apdu)
apdu->u.initResponse->protocolVersion = nopt;
}
}
apdu->u.initResponse->protocolVersion = nopt;
}
}
- int r = send_PDU_convert(apdu, &len);
+ int r = send_PDU_convert(apdu);
if (r)
return r;
if (r)
return r;
- m_bytes_sent += len;
- m_bw_stat.add_bytes(len);
if (kill_session)
{
delete m_client;
m_client = 0;
m_parent->pre_init();
}
if (kill_session)
{
delete m_client;
m_client = 0;
m_parent->pre_init();
}
- if (m_http_version)
- {
- if (!m_http_keepalive)
- {
-#if 1
- timeout(1);
-#else
- shutdown();
- return -1;
-#endif
- }
- }
return r;
}
return r;
}
@@
-1492,12
+1517,22
@@
Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
rc_temp.u.simple = sr->smallSetElementSetNames;
rc = &rc_temp;
}
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,
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 =
if (err == -1)
{
sr->preferredRecordSyntax =
@@
-1525,11
+1560,21
@@
Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
char *addinfo = 0;
Yaz_ProxyConfig *cfg = check_reconfigure();
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,
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 =
if (err == -1)
{
pr->preferredRecordSyntax =
@@
-1771,12
+1816,12
@@
void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
z_presentRequest->preferredRecordSyntax =
yaz_oidval_to_z3950oid(m_s2z_odr_search, CLASS_RECSYN,
VAL_TEXT_XML);
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)
{
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 =
z_presentRequest->recordComposition->which =
Z_RecordComp_simple;
z_presentRequest->recordComposition->u.simple =
@@
-1866,8
+1911,8
@@
void Yaz_Proxy::handle_incoming_HTTP(Z_HTTP_Request *hreq)
}
int len = 0;
Z_GDU *p = z_get_HTTP_Response(odr_encode(), 400);
}
int len = 0;
Z_GDU *p = z_get_HTTP_Response(odr_encode(), 400);
+ timeout(0);
send_GDU(p, &len);
send_GDU(p, &len);
- timeout(1);
}
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
}
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
@@
-1878,6
+1923,8
@@
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
m_mem_invalid_session = odr_extract_mem(odr_decode());
apdu = m_initRequest_apdu;
}
m_mem_invalid_session = odr_extract_mem(odr_decode());
apdu = m_initRequest_apdu;
}
+
+ m_referenceId = get_referenceIdP(apdu);
// Determine our client.
Z_OtherInformation **oi;
// Determine our client.
Z_OtherInformation **oi;
@@
-2232,6
+2279,8
@@
void Yaz_Proxy::timeoutNotify()
else if (apdu->which == Z_GDU_HTTP_Request)
handle_incoming_HTTP(apdu->u.HTTP_Request);
}
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();
else
{
inc_request_no();
@@
-2342,6
+2391,7
@@
int Yaz_Proxy::handle_init_response_for_invalid_session(Z_APDU *apdu)
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu, int len)
{
m_bytes_recv += len;
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)
m_pdu_recv++;
m_waiting = 0;
if (m_root->get_log_mask() & PROXY_LOG_REQ_SERVER)