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
Removed yazproxy source
[yazpp-moved-to-github.git]
/
src
/
yaz-ir-assoc.cpp
diff --git
a/src/yaz-ir-assoc.cpp
b/src/yaz-ir-assoc.cpp
index
f8ca2d0
..
ace54d5
100644
(file)
--- a/
src/yaz-ir-assoc.cpp
+++ b/
src/yaz-ir-assoc.cpp
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: yaz-ir-assoc.cpp,v 1.18 2002-10-09 12:50:26 adam Exp $
+ * $Id: yaz-ir-assoc.cpp,v 1.21 2004-03-30 18:14:13 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-149,9
+149,16
@@
void Yaz_IR_Assoc::get_elementSetName (const char **elementSetName)
*elementSetName = m_elementSetNames->u.generic;
}
*elementSetName = m_elementSetNames->u.generic;
}
-void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu)
+
+void Yaz_IR_Assoc::recv_GDU(Z_GDU *apdu, int len)
{
{
- yaz_log (m_log, "recv_Z_PDU");
+ if (apdu->which == Z_GDU_Z3950)
+ recv_Z_PDU(apdu->u.z3950, len);
+}
+
+void Yaz_IR_Assoc::recv_Z_PDU(Z_APDU *apdu, int len)
+{
+ yaz_log (m_log, "recv_Z_PDU %d bytes", len);
m_lastReceived = apdu->which;
switch (apdu->which)
{
m_lastReceived = apdu->which;
switch (apdu->which)
{
@@
-227,7
+234,7
@@
int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
req->resultSetName = pResultSetId;
}
req->resultSetName = pResultSetId;
}
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
int Yaz_IR_Assoc::send_presentRequest(int start,
}
int Yaz_IR_Assoc::send_presentRequest(int start,
@@
-276,7
+283,7
@@
int Yaz_IR_Assoc::send_presentRequest(int start,
req->resultSetId = pResultSetId;
}
req->resultSetId = pResultSetId;
}
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::set_proxy(const char *str)
}
void Yaz_IR_Assoc::set_proxy(const char *str)
@@
-330,19
+337,19
@@
const char *Yaz_IR_Assoc::get_host()
void Yaz_IR_Assoc::recv_searchRequest(Z_SearchRequest *searchRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_searchResponse);
void Yaz_IR_Assoc::recv_searchRequest(Z_SearchRequest *searchRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_searchResponse);
- send_Z_PDU(apdu);
+ send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::recv_presentRequest(Z_PresentRequest *presentRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_presentResponse);
}
void Yaz_IR_Assoc::recv_presentRequest(Z_PresentRequest *presentRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_presentResponse);
- send_Z_PDU(apdu);
+ send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::recv_initRequest(Z_InitRequest *initRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
}
void Yaz_IR_Assoc::recv_initRequest(Z_InitRequest *initRequest)
{
Z_APDU *apdu = create_Z_PDU(Z_APDU_initResponse);
- send_Z_PDU(apdu);
+ send_Z_PDU(apdu, 0);
}
void Yaz_IR_Assoc::recv_searchResponse (Z_SearchResponse *searchResponse)
}
void Yaz_IR_Assoc::recv_searchResponse (Z_SearchResponse *searchResponse)
@@
-398,7
+405,7
@@
int Yaz_IR_Assoc::send_initRequest(char* pRefId)
set_otherInformationString(&req->otherInfo, VAL_PROXY, 1, m_host);
if (m_cookie)
set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
set_otherInformationString(&req->otherInfo, VAL_PROXY, 1, m_host);
if (m_cookie)
set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
}
int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
@@
-430,8
+437,7
@@
int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
if (m_cookie)
set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
if (m_cookie)
set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
-
- return send_Z_PDU(apdu);
+ return send_Z_PDU(apdu, 0);
}
}