X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-ir-assoc.cpp;h=b38b3fdb5f221de2365bc7f38c8f2e82aafe17da;hb=86726b00b052694e65b036c262f5fe9096554175;hp=f8ca2d079f04fb2c449533dfc0585ceda85f8b30;hpb=ceb226cb18d96a6b3aa2dd6cff94aa27850362cf;p=yazpp-moved-to-github.git

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index f8ca2d0..b38b3fd 100644
--- 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.
  * 
- * $Id: yaz-ir-assoc.cpp,v 1.18 2002-10-09 12:50:26 adam Exp $
+ * $Id: yaz-ir-assoc.cpp,v 1.24 2005-06-02 06:40:21 adam Exp $
  */
 
 #include <assert.h>
@@ -10,6 +10,8 @@
 #include <yaz/log.h>
 #include <yaz++/ir-assoc.h>
 
+using namespace yazpp_1;
+
 Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
     : Yaz_Z_Assoc(the_PDU_Observable)
 {
@@ -21,7 +23,7 @@ Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
     m_host = 0;
     m_proxy = 0;
     m_cookie = 0;
-    m_log = LOG_DEBUG;
+    m_log = YLOG_DEBUG;
     const char *db = "Default";
     set_databaseNames(1, &db);
 }
@@ -149,9 +151,16 @@ void Yaz_IR_Assoc::get_elementSetName (const char **elementSetName)
     *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)
+{
+    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");
+    yaz_log (m_log, "recv_Z_PDU %d bytes", len);
     m_lastReceived = apdu->which;
     switch (apdu->which)
     {
@@ -227,7 +236,7 @@ int Yaz_IR_Assoc::send_searchRequest(Yaz_Z_Query *query,
         req->resultSetName = pResultSetId;
     }
 
-    return send_Z_PDU(apdu);
+    return send_Z_PDU(apdu, 0);
 }
 
 int Yaz_IR_Assoc::send_presentRequest(int start, 
@@ -276,7 +285,7 @@ int Yaz_IR_Assoc::send_presentRequest(int start,
         req->resultSetId = pResultSetId;
     }
 
-    return send_Z_PDU(apdu);
+    return send_Z_PDU(apdu, 0);
 }
 
 void Yaz_IR_Assoc::set_proxy(const char *str)
@@ -330,19 +339,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);
-    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);
-    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);
-    send_Z_PDU(apdu);
+    send_Z_PDU(apdu, 0);
 }
 
 void Yaz_IR_Assoc::recv_searchResponse (Z_SearchResponse *searchResponse)
@@ -398,7 +407,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);
-    return send_Z_PDU(apdu);
+    return send_Z_PDU(apdu, 0);
 }
 
 int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
@@ -430,8 +439,7 @@ int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
     if (m_cookie)
         set_otherInformationString(&req->otherInfo, VAL_COOKIE, 1, m_cookie);
 
-
-    return send_Z_PDU(apdu);
+    return send_Z_PDU(apdu, 0);
 }