X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=0c775e74fe1659d10c6c1ddfc67e56f19ff57270;hb=e160ff52e235fc6ad53ffac77b37642cb7cb8dfd;hp=21e432507d236800875a1851ef94fe07c6783346;hpb=a7bb1a7f8f0c91fa5bc74f712b3e00cb962a0263;p=metaproxy-moved-to-github.git

diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp
index 21e4325..0c775e7 100644
--- a/src/filter_z3950_client.cpp
+++ b/src/filter_z3950_client.cpp
@@ -1,5 +1,5 @@
-/* $Id: filter_z3950_client.cpp,v 1.13 2006-01-03 15:34:10 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_z3950_client.cpp,v 1.24 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
@@ -7,7 +7,6 @@
 #include "config.hpp"
 
 #include "filter.hpp"
-#include "router.hpp"
 #include "package.hpp"
 #include "util.hpp"
 #include "filter_z3950_client.hpp"
@@ -29,15 +28,16 @@
 #include <yaz++/pdu-assoc.h>
 #include <yaz++/z-assoc.h>
 
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
 
-namespace yp2 {
+namespace metaproxy_1 {
     namespace filter {
         class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
             friend class Rep;
             Assoc(yazpp_1::SocketManager *socket_manager,
                   yazpp_1::IPDU_Observable *PDU_Observable,
-                  std::string host);
+                  std::string host, int timeout);
             ~Assoc();
             void connectNotify();
             void failNotify();
@@ -55,15 +55,17 @@ namespace yp2 {
             bool m_destroyed;
             bool m_connected;
             int m_queue_len;
-            int m_ticks;
+            int m_time_elapsed;
+            int m_time_max;
             std::string m_host;
         };
 
         class Z3950Client::Rep {
         public:
+            int m_timeout_sec;
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
-            std::map<yp2::Session,Z3950Client::Assoc *> m_clients;
+            std::map<mp::Session,Z3950Client::Assoc *> m_clients;
             Z3950Client::Assoc *get_assoc(Package &package);
             void send_and_receive(Package &package,
                                   yf::Z3950Client::Assoc *c);
@@ -72,15 +74,16 @@ namespace yp2 {
     }
 }
 
-using namespace yp2;
+using namespace mp;
 
 yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager,
                               yazpp_1::IPDU_Observable *PDU_Observable,
-                              std::string host)
+                              std::string host, int timeout_sec)
     :  Z_Assoc(PDU_Observable),
        m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable),
        m_package(0), m_in_use(true), m_waiting(false), 
-       m_destroyed(false), m_connected(false), m_queue_len(1), m_ticks(0),
+       m_destroyed(false), m_connected(false), m_queue_len(1),
+       m_time_elapsed(0), m_time_max(timeout_sec), 
        m_host(host)
 {
     // std::cout << "create assoc " << this << "\n";
@@ -102,31 +105,42 @@ void yf::Z3950Client::Assoc::failNotify()
 {
     m_waiting = false;
 
-    yp2::odr odr;
+    mp::odr odr;
 
     if (m_package)
     {
-        m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+        Z_GDU *gdu = m_package->request().get();
+        Z_APDU *apdu = 0;
+        if (gdu && gdu->which == Z_GDU_Z3950)
+            apdu = gdu->u.z3950;
+        
+        m_package->response() = odr.create_close(apdu, Z_Close_peerAbort, 0);
         m_package->session().close();
     }
 }
 
 void yf::Z3950Client::Assoc::timeoutNotify()
 {
-    std::cout << "TIMEOUT NOTIFY\n";
-    m_ticks++;
-    if (m_ticks == 30)
+    m_time_elapsed++;
+    if (m_time_elapsed >= m_time_max)
     {
         m_waiting = false;
 
-        yp2::odr odr;
+        mp::odr odr;
         
         if (m_package)
         {
+            Z_GDU *gdu = m_package->request().get();
+            Z_APDU *apdu = 0;
+            if (gdu && gdu->which == Z_GDU_Z3950)
+                apdu = gdu->u.z3950;
+        
             if (m_connected)
-                m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
+                m_package->response() =
+                    odr.create_close(apdu, Z_Close_lackOfActivity, 0);
             else
-                m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+                m_package->response() = 
+                    odr.create_close(apdu, Z_Close_peerAbort, 0);
                 
             m_package->session().close();
         }
@@ -151,6 +165,7 @@ yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify(
 
 yf::Z3950Client::Z3950Client() :  m_p(new yf::Z3950Client::Rep)
 {
+    m_p->m_timeout_sec = 30;
 }
 
 yf::Z3950Client::~Z3950Client() {
@@ -161,7 +176,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
     // only one thread messes with the clients list at a time
     boost::mutex::scoped_lock lock(m_mutex);
 
-    std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
+    std::map<mp::Session,yf::Z3950Client::Assoc *>::iterator it;
     
     Z_GDU *gdu = package.request().get();
     // only deal with Z39.50
@@ -200,32 +215,55 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
     // check that it is init. If not, close
     if (apdu->which != Z_APDU_initRequest)
     {
-        yp2::odr odr;
+        mp::odr odr;
         
-        package.response() = odr.create_close(Z_Close_protocolError,
+        package.response() = odr.create_close(apdu,
+                                              Z_Close_protocolError,
                                               "First PDU was not an "
                                               "Initialize Request");
         package.session().close();
         return 0;
     }
-    // check virtual host
-    const char *vhost =
-        yaz_oi_get_string_oidval(&apdu->u.initRequest->otherInfo,
-                                 VAL_PROXY, 1, 0);
-    if (!vhost)
+    std::list<std::string> vhosts;
+    mp::util::get_vhost_otherinfo(&apdu->u.initRequest->otherInfo,
+                                   true, vhosts);
+    size_t no_vhosts = vhosts.size();
+    if (no_vhosts == 0)
     {
-        yp2::odr odr;
+        mp::odr odr;
         package.response() = odr.create_initResponse(
+            apdu,
             YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
-            "Virtual host not given");
+            "z3950_client: No virtal host given");
         
         package.session().close();
         return 0;
     }
+    if (no_vhosts > 1)
+    {
+        mp::odr odr;
+        package.response() = odr.create_initResponse(
+            apdu,
+            YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP,
+            "z3950_client: Can not cope with multiple vhosts");
+        package.session().close();
+        return 0;
+    }
+    std::list<std::string>::const_iterator v_it = vhosts.begin();
+    std::list<std::string> dblist;
+    std::string host;
+    mp::util::split_zurl(*v_it, host, dblist);
     
+    if (dblist.size())
+    {
+        ; // z3950_client: Databases in vhost ignored
+    }
+
     yazpp_1::SocketManager *sm = new yazpp_1::SocketManager;
     yazpp_1::PDU_Assoc *pdu_as = new yazpp_1::PDU_Assoc(sm);
-    yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as, vhost);
+    yf::Z3950Client::Assoc *as = new yf::Z3950Client::Assoc(sm, pdu_as,
+                                                            host.c_str(),
+                                                            m_timeout_sec);
     m_clients[package.session()] = as;
     return as;
 }
@@ -241,7 +279,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package,
     if (!gdu || gdu->which != Z_GDU_Z3950)
         return;
 
-    c->m_ticks = 0;
+    c->m_time_elapsed = 0;
     c->m_package = &package;
     c->m_waiting = true;
     if (!c->m_connected)
@@ -259,7 +297,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package,
     }
 
     // prepare response
-    c->m_ticks = 0;
+    c->m_time_elapsed = 0;
     c->m_waiting = true;
     
     // relay the package  ..
@@ -283,7 +321,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package,
 void yf::Z3950Client::Rep::release_assoc(Package &package)
 {
     boost::mutex::scoped_lock lock(m_mutex);
-    std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
+    std::map<mp::Session,yf::Z3950Client::Assoc *>::iterator it;
     
     it = m_clients.find(package.session());
     if (it != m_clients.end())
@@ -325,6 +363,42 @@ void yf::Z3950Client::process(Package &package) const
     m_p->release_assoc(package);
 }
 
+void yf::Z3950Client::configure(const xmlNode *ptr)
+{
+    for (ptr = ptr->children; ptr; ptr = ptr->next)
+    {
+        if (ptr->type != XML_ELEMENT_NODE)
+            continue;
+        if (!strcmp((const char *) ptr->name, "timeout"))
+        {
+            std::string timeout_str = mp::xml::get_text(ptr);
+            int timeout_sec = atoi(timeout_str.c_str());
+            if (timeout_sec < 2)
+                throw mp::filter::FilterException("Bad timeout value " 
+                                                   + timeout_str);
+            m_p->m_timeout_sec = timeout_sec;
+        }
+        else
+        {
+            throw mp::filter::FilterException("Bad element " 
+                                               + std::string((const char *)
+                                                             ptr->name));
+        }
+    }
+}
+
+static mp::filter::Base* filter_creator()
+{
+    return new mp::filter::Z3950Client;
+}
+
+extern "C" {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_z3950_client = {
+        0,
+        "z3950_client",
+        filter_creator
+    };
+}
 
 /*
  * Local variables: