projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WRBUF updates
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy.cpp
diff --git
a/src/yaz-proxy.cpp
b/src/yaz-proxy.cpp
index
3dfdb00
..
6c99ef3
100644
(file)
--- a/
src/yaz-proxy.cpp
+++ b/
src/yaz-proxy.cpp
@@
-1,4
+1,4
@@
-/* $Id: yaz-proxy.cpp,v 1.69 2006-06-28 23:38:23 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.72 2007-03-20 07:54:27 adam Exp $
Copyright (c) 1998-2006, Index Data.
This file is part of the yazproxy.
Copyright (c) 1998-2006, Index Data.
This file is part of the yazproxy.
@@
-314,7
+314,7
@@
Yaz_Proxy::~Yaz_Proxy()
delete m_charset_converter;
xfree(m_optimize);
delete m_charset_converter;
xfree(m_optimize);
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
#endif
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
#endif
@@
-877,7
+877,7
@@
int Yaz_Proxy::convert_xsl(Z_NamePlusRecordList *p, Z_APDU *apdu)
void Yaz_Proxy::convert_xsl_delay()
{
void Yaz_Proxy::convert_xsl_delay()
{
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
Z_NamePlusRecord *npr = m_stylesheet_nprl->records[m_stylesheet_offset];
if (npr->which == Z_NamePlusRecord_databaseRecord)
{
@@
-920,7
+920,7
@@
void Yaz_Proxy::convert_xsl_delay()
{
m_timeout_mode = timeout_normal;
m_stylesheet_nprl = 0;
{
m_timeout_mode = timeout_normal;
m_stylesheet_nprl = 0;
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
#endif
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
#endif
@@
-1039,7
+1039,7
@@
void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p,
npr->u.databaseRecord =
z_ext_record(odr_encode(), ent->value, wrbuf_buf(w),
wrbuf_len(w));
npr->u.databaseRecord =
z_ext_record(odr_encode(), ent->value, wrbuf_buf(w),
wrbuf_len(w));
- wrbuf_free(w, 1);
+ wrbuf_destroy(w);
}
else if (ent->value == VAL_TEXT_XML)
{
}
else if (ent->value == VAL_TEXT_XML)
{
@@
-1047,8
+1047,8
@@
void Yaz_Proxy::convert_records_charset(Z_NamePlusRecordList *p,
}
else if (r->which == Z_External_octet)
{
}
else if (r->which == Z_External_octet)
{
- int rlen;
- char *result;
+ size_t rlen;
+ const char *result;
if (yaz_marc_decode_buf(mt,
(char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len,
if (yaz_marc_decode_buf(mt,
(char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len,
@@
-1093,12
+1093,12
@@
void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p,
odr_encode(), VAL_TEXT_XML,
wrbuf_buf(w), wrbuf_len(w)
);
odr_encode(), VAL_TEXT_XML,
wrbuf_buf(w), wrbuf_len(w)
);
- wrbuf_free(w, 1);
+ wrbuf_destroy(w);
}
else if (r->which == Z_External_octet)
{
}
else if (r->which == Z_External_octet)
{
- int rlen;
- char *result;
+ size_t rlen;
+ const char *result;
if (yaz_marc_decode_buf(mt, (char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len,
&result, &rlen))
if (yaz_marc_decode_buf(mt, (char*) r->u.octet_aligned->buf,
r->u.octet_aligned->len,
&result, &rlen))
@@
-1182,7
+1182,7
@@
int Yaz_Proxy::send_srw_response(Z_SRW_PDU *srw_pdu, int http_code /* = 200 */)
z_HTTP_header_add(o, &hres->headers, "WWW-Authenticate", "Basic realm=\"YAZ Proxy\"");
static Z_SOAP_Handler soap_handlers[2] = {
z_HTTP_header_add(o, &hres->headers, "WWW-Authenticate", "Basic realm=\"YAZ Proxy\"");
static Z_SOAP_Handler soap_handlers[2] = {
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
{"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
#endif
{"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
#endif
@@
-1718,7
+1718,7
@@
Z_APDU *Yaz_Proxy::result_set_optimize(Z_APDU *apdu)
return 0;
}
return 0;
}
- char query_str[120];
+ char query_str[4096];
this_query->print(query_str, sizeof(query_str)-1);
yaz_log(YLOG_LOG, "%sSearch %s", m_session_str, query_str);
this_query->print(query_str, sizeof(query_str)-1);
yaz_log(YLOG_LOG, "%sSearch %s", m_session_str, query_str);
@@
-2499,7
+2499,7
@@
Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
{
m_parent->low_socket_close();
{
m_parent->low_socket_close();
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
@@
-2576,7
+2576,7
@@
Z_APDU *Yaz_Proxy::handle_syntax_validation(Z_APDU *apdu)
{
m_parent->low_socket_close();
{
m_parent->low_socket_close();
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)
if (m_stylesheet_xsp)
xsltFreeStylesheet((xsltStylesheetPtr) m_stylesheet_xsp);
m_stylesheet_xsp = xsltParseStylesheetFile((const xmlChar*)