In tests use BOOST_AUTO_UNIT_TEST instead of BOOST_AUTO_TEST_CASE

[metaproxy-moved-to-github.git] / src / filter_z3950_client.cpp

diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp
index f0323dc..6d51c9e 100644 (file)
--- a/src/filter_z3950_client.cpp
+++ b/src/filter_z3950_client.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_z3950_client.cpp,v 1.7 2005-10-30 16:39:18 adam Exp $
+/* $Id: filter_z3950_client.cpp,v 1.11 2005-11-10 23:10:42 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -6,16 +6,20 @@
 
 #include "config.hpp"
 
-#include <map>
 #include "filter.hpp"
 #include "router.hpp"
 #include "package.hpp"
+#include "util.hpp"
+#include "filter_z3950_client.hpp"
+
+#include <map>
+#include <stdexcept>
+#include <list>
+#include <iostream>
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 
-#include "filter_z3950_client.hpp"
-
 #include <yaz/zgdu.h>
 #include <yaz/log.h>
 #include <yaz/otherinfo.h>
@@ -25,15 +29,12 @@
 #include <yaz++/pdu-assoc.h>
 #include <yaz++/z-assoc.h>
 
-#include <iostream>
-
 namespace yf = yp2::filter;
 
 namespace yp2 {
     namespace filter {
         class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
             friend class Rep;
-        public:
             Assoc(yazpp_1::SocketManager *socket_manager,
                   yazpp_1::IPDU_Observable *PDU_Observable,
                   std::string host);
@@ -45,8 +46,7 @@ namespace yp2 {
             yazpp_1::IPDU_Observer* sessionNotify(
                 yazpp_1::IPDU_Observable *the_PDU_Observable,
                 int fd);
-        private:
-            // yp2::Session m_session_id;
+
             yazpp_1::SocketManager *m_socket_manager;
             yazpp_1::IPDU_Observable *m_PDU_Observable;
             Package *m_package;
@@ -69,6 +69,7 @@ namespace yp2 {
     }
 }
 
+using namespace yp2;
 
 yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
                               yazpp_1::IPDU_Observable *PDU_Observable,
@@ -97,37 +98,26 @@ void yf::Z3950Client::Assoc::failNotify()
 {
     m_waiting = false;
 
-    ODR odr = odr_createmem(ODR_ENCODE);
-
-    Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
-
-    *apdu->u.close->closeReason = Z_Close_peerAbort;
+    yp2::odr odr;
 
     if (m_package)
     {
-        m_package->response() = apdu;
+        m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
         m_package->session().close();
     }
-
-    odr_destroy(odr);
 }
 
 void yf::Z3950Client::Assoc::timeoutNotify()
 {
     m_waiting = false;
 
-    ODR odr = odr_createmem(ODR_ENCODE);
-
-    Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
-
-    *apdu->u.close->closeReason = Z_Close_lackOfActivity;
+    yp2::odr odr;
 
     if (m_package)
     {
-        m_package->response() = apdu;
+        m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
         m_package->session().close();
     }
-    odr_destroy(odr);
 }
 
 void yf::Z3950Client::Assoc::recv_GDU(Z_GDU *gdu, int len)
@@ -189,17 +179,11 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
     // check that it is init. If not, close
     if (apdu->which != Z_APDU_initRequest)
     {
-        ODR odr = odr_createmem(ODR_ENCODE);
-        Z_APDU *apdu = zget_APDU(odr, Z_APDU_close);
-        
-        *apdu->u.close->closeReason = Z_Close_protocolError;
-        apdu->u.close->diagnosticInformation =
-            odr_strdup(odr, "no init request for session");
-
-        package.response() = apdu;
+        yp2::odr odr;
         
+        package.response() = odr.create_close(Z_Close_protocolError,
+                                              "no init request for session");
         package.session().close();
-        odr_destroy(odr);
         return 0;
     }
     // check virtual host
@@ -208,17 +192,12 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
                                  VAL_PROXY, 1, 0);
     if (!vhost)
     {
-        ODR odr = odr_createmem(ODR_ENCODE);
-        Z_APDU *apdu = zget_APDU(odr, Z_APDU_initResponse);
+        yp2::odr odr;
+        package.response() = odr.create_initResponse(
+            YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
+            "Virtual host not given");
         
-        apdu->u.initResponse->userInformationField =
-            zget_init_diagnostics(odr, 
-                                  YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
-                                  "Virtual host not given");
-        package.response() = apdu;
-            
         package.session().close();
-        odr_destroy(odr);
         return 0;
     }