The configure method takes test_only flag so we can avoid

[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 0c775e7..9cbea57 100644 (file)
--- a/src/filter_z3950_client.cpp
+++ b/src/filter_z3950_client.cpp
@@ -1,7 +1,27 @@
-/* $Id: filter_z3950_client.cpp,v 1.24 2006-03-16 10:40:59 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_z3950_client.cpp,v 1.32 2008-02-20 15:07:52 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
+/* $Id: filter_z3950_client.cpp,v 1.32 2008-02-20 15:07:52 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -24,9 +44,9 @@
 #include <yaz/otherinfo.h>
 #include <yaz/diagbib1.h>
 
-#include <yaz++/socket-manager.h>
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/z-assoc.h>
+#include <yazpp/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/z-assoc.h>
 
 namespace mp = metaproxy_1;
 namespace yf = mp::filter;
@@ -62,7 +82,10 @@ namespace metaproxy_1 {
 
         class Z3950Client::Rep {
         public:
+            // number of seconds to wait before we give up request
             int m_timeout_sec;
+            std::string m_default_target;
+            std::string m_force_target;
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
             std::map<mp::Session,Z3950Client::Assoc *> m_clients;
@@ -192,6 +215,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
         while(true)
         {
 #if 0
+            // double init .. NOT working yet
             if (gdu && gdu->which == Z_GDU_Z3950 &&
                 gdu->u.z3950->which == Z_APDU_initRequest)
             {
@@ -224,35 +248,48 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package)
         package.session().close();
         return 0;
     }
-    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)
-    {
-        mp::odr odr;
-        package.response() = odr.create_initResponse(
-            apdu,
-            YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
-            "z3950_client: No virtal host given");
-        
-        package.session().close();
-        return 0;
-    }
-    if (no_vhosts > 1)
+    std::string target = m_force_target;
+    if (!target.length())
     {
-        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;
+        target = m_default_target;
+        std::list<std::string> vhosts;
+        mp::util::remove_vhost_otherinfo(&apdu->u.initRequest->otherInfo,
+                                         vhosts);
+        size_t no_vhosts = vhosts.size();
+        if (no_vhosts == 1)
+        {
+            std::list<std::string>::const_iterator v_it = vhosts.begin();
+            target = *v_it;
+        }
+        else if (no_vhosts == 0)
+        {
+            if (!target.length())
+            {
+                // no default target. So we don't know where to connect
+                mp::odr odr;
+                package.response() = odr.create_initResponse(
+                    apdu,
+                    YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED,
+                    "z3950_client: No virtal host given");
+                
+                package.session().close();
+                return 0;
+            }
+        }
+        else 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);
+    mp::util::split_zurl(target, host, dblist);
     
     if (dblist.size())
     {
@@ -285,7 +322,7 @@ void yf::Z3950Client::Rep::send_and_receive(Package &package,
     if (!c->m_connected)
     {
         c->client(c->m_host.c_str());
-        c->timeout(1);
+        c->timeout(1);  // so timeoutNotify gets called once per second
 
         while (!c->m_destroyed && c->m_waiting 
                && c->m_socket_manager->processEvent() > 0)
@@ -363,7 +400,7 @@ void yf::Z3950Client::process(Package &package) const
     m_p->release_assoc(package);
 }
 
-void yf::Z3950Client::configure(const xmlNode *ptr)
+void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -371,12 +408,15 @@ void yf::Z3950Client::configure(const xmlNode *ptr)
             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;
+            m_p->m_timeout_sec = mp::xml::get_int(ptr->children, 30);
+        }
+        else if (!strcmp((const char *) ptr->name, "default_target"))
+        {
+            m_p->m_default_target = mp::xml::get_text(ptr);
+        }
+        else if (!strcmp((const char *) ptr->name, "force_target"))
+        {
+            m_p->m_force_target = mp::xml::get_text(ptr);
         }
         else
         {