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
Use proper recordcharset for opacxml.
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy.cpp
diff --git
a/src/yaz-proxy.cpp
b/src/yaz-proxy.cpp
index
17ed69e
..
8c55480
100644
(file)
--- a/
src/yaz-proxy.cpp
+++ b/
src/yaz-proxy.cpp
@@
-1,4
+1,4
@@
-/* $Id: yaz-proxy.cpp,v 1.24.2.1 2005-05-27 18:00:28 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.24.2.3 2006-03-09 00:08:07 adam Exp $
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
@@
-851,7
+851,7
@@
void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p,
{
WRBUF w = wrbuf_alloc();
{
WRBUF w = wrbuf_alloc();
- yaz_display_OPAC(w, r->u.opac, 0);
+ yaz_opac_decode_wrbuf(mt, r->u.opac, w);
npr->u.databaseRecord = z_ext_record(
odr_encode(), VAL_TEXT_XML,
wrbuf_buf(w), wrbuf_len(w)
npr->u.databaseRecord = z_ext_record(
odr_encode(), VAL_TEXT_XML,
wrbuf_buf(w), wrbuf_len(w)
@@
-2505,14
+2505,15
@@
void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
m_initRequest_maximumRecordSize = *apdu->u.initRequest->
maximumRecordSize;
*apdu->u.initRequest->maximumRecordSize = 1024*1024;
m_initRequest_maximumRecordSize = *apdu->u.initRequest->
maximumRecordSize;
*apdu->u.initRequest->maximumRecordSize = 1024*1024;
-
+
+ Z_CharSetandLanguageNegotiation *charSetandLangRecord =
+ yaz_get_charneg_record(*oi);
+
// Save proposal charsets and langs.
if (ODR_MASK_GET(apdu->u.initRequest->options,
// Save proposal charsets and langs.
if (ODR_MASK_GET(apdu->u.initRequest->options,
- Z_Options_negotiationModel))
+ Z_Options_negotiationModel)
+ && charSetandLangRecord)
{
{
- Z_CharSetandLanguageNegotiation *charSetandLangRecord =
- yaz_get_charneg_record(*oi);
-
yaz_get_proposal_charneg(m_referenceId_mem,
charSetandLangRecord,
&m_initRequest_oi_negotiation_charsets,
yaz_get_proposal_charneg(m_referenceId_mem,
charSetandLangRecord,
&m_initRequest_oi_negotiation_charsets,