From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 29 Jan 2008 16:51:12 +0000 (+0000)
Subject: New feature: jilter sru_z3950 handles x-target=host .
X-Git-Tag: METAPROXY.1.0.13~29
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=fded284bf0a30c454f83741d52ccb06023b5627f;p=metaproxy-moved-to-github.git

New feature: jilter sru_z3950 handles x-target=host .

Filter sru_z3950 now handles x-target=host . The value (host) is
the address of a target (vhost). The vhost can be used by, for
example, z3950_client to connect to any Z39.50 server. Note that
at this stage the database is NOT set by the x-target. This must
also be done in order for this feature to be useful.
---

diff --git a/etc/config-sru-to-z3950.xml b/etc/config-sru-to-z3950.xml
index 7ec98de..1733ae2 100644
--- a/etc/config-sru-to-z3950.xml
+++ b/etc/config-sru-to-z3950.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config-sru-to-z3950.xml,v 1.21 2007-12-16 22:22:49 adam Exp $ -->
+<!-- $Id: config-sru-to-z3950.xml,v 1.22 2008-01-29 16:51:12 adam Exp $ -->
 <metaproxy 
     xmlns="http://indexdata.com/metaproxy" 
     version="1.0">
@@ -99,7 +99,10 @@
         </virtual>
       </filter>
 
-
+      <filter type="session_shared"/>
+      <filter type="z3950_client">
+	<timeout>30</timeout>
+      </filter>
       <filter type="bounce"/>
     </route>
   </routes>
diff --git a/src/filter_load_balance.cpp b/src/filter_load_balance.cpp
index 8685971..ea1a8ba 100644
--- a/src/filter_load_balance.cpp
+++ b/src/filter_load_balance.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_load_balance.cpp,v 1.8 2007-05-09 21:23:09 adam Exp $
+/* $Id: filter_load_balance.cpp,v 1.9 2008-01-29 16:51:12 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
 This file is part of Metaproxy.
@@ -189,7 +189,7 @@ void yf::LoadBalance::Impl::process(mp::Package &package)
                 
                 // copying new target into init package
                 mp::util::set_vhost_otherinfo(&(org_init->otherInfo), 
-                                              odr_en, target); 
+                                              odr_en, target, 1);
                 package.request() = gdu_req;
         }
             
diff --git a/src/filter_sru_to_z3950.cpp b/src/filter_sru_to_z3950.cpp
index a19bcc4..6d3b10a 100644
--- a/src/filter_sru_to_z3950.cpp
+++ b/src/filter_sru_to_z3950.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_sru_to_z3950.cpp,v 1.35 2007-05-09 21:23:09 adam Exp $
+/* $Id: filter_sru_to_z3950.cpp,v 1.36 2008-01-29 16:51:12 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
 This file is part of Metaproxy.
@@ -64,23 +64,22 @@ namespace metaproxy_1 {
 
             bool z3950_init_request(mp::Package &package, 
                                     mp::odr &odr_en,
-                                    Z_SRW_PDU *sru_pdu_res,
-                                    const std::string 
-                                    &database = "Default") const;
+                                    Z_SRW_PDU *sru_pdu_req,
+                                    Z_SRW_PDU *sru_pdu_res) const;
 
             bool z3950_close_request(mp::Package &package) const;
 
-            bool z3950_search_request(mp::Package &package,
-                                      mp::odr &odr_en,
-                                      Z_SRW_PDU *sru_pdu_res,
-                                      Z_SRW_searchRetrieveRequest 
-                                          const *sr_req) const;
+            bool z3950_search_request(
+                mp::Package &package,
+                mp::odr &odr_en,
+                Z_SRW_PDU *sru_pdu_res,
+                Z_SRW_searchRetrieveRequest const *sr_req) const;
 
-            bool z3950_present_request(mp::Package &package,
-                                       mp::odr &odr_en,
-                                       Z_SRW_PDU *sru_pdu_res,
-                                       Z_SRW_searchRetrieveRequest 
-                                       const *sr_req) const;
+            bool z3950_present_request(
+                mp::Package &package,
+                mp::odr &odr_en,
+                Z_SRW_PDU *sru_pdu_res,
+                Z_SRW_searchRetrieveRequest const *sr_req) const;
 
             bool z3950_scan_request(mp::Package &package,
                                     mp::odr &odr_en,
@@ -234,7 +233,7 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
         ok = mp_util::check_sru_query_exists(package, odr_en, 
                                              sru_pdu_res, sr_req);
 
-        if (ok && z3950_init_request(package, odr_en, sru_pdu_res))
+        if (ok && z3950_init_request(package, odr_en, sru_pdu_req, sru_pdu_res))
         {
             {
                 ok = z3950_search_request(package, odr_en,
@@ -270,7 +269,8 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
                                4, "scan");
  
         // to be used when we do scan
-        if (false && z3950_init_request(package, odr_en, sru_pdu_res))
+        if (false && z3950_init_request(package, odr_en, sru_pdu_req,
+                                        sru_pdu_res))
         {
             z3950_scan_request(package, odr_en, sru_pdu_res, sr_req);    
             z3950_close_request(package);
@@ -295,8 +295,8 @@ void yf::SRUtoZ3950::Impl::process(mp::Package &package)
 bool 
 yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package, 
                                          mp::odr &odr_en,
-                                         Z_SRW_PDU *sru_pdu_res,
-                                         const std::string &database) const
+                                         Z_SRW_PDU *sru_pdu_req,
+                                         Z_SRW_PDU *sru_pdu_res) const
 {
     // prepare Z3950 package
     Package z3950_package(package.session(), package.origin());
@@ -321,6 +321,16 @@ yf::SRUtoZ3950::Impl::z3950_init_request(mp::Package &package,
     ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_2);
     ODR_MASK_SET(init_req->protocolVersion, Z_ProtocolVersion_3);
 
+    Z_SRW_extra_arg *arg;
+    for ( arg = sru_pdu_req->extra_args; arg; arg = arg->next)
+        if (!strcmp(arg->name, "x-target"))
+        {
+            std::string target(arg->value);
+            mp_util::set_vhost_otherinfo(&init_req->otherInfo,
+                                         odr_en, target, 1);
+            
+        }
+
     z3950_package.request() = apdu;
 
     // send Z3950 package
diff --git a/src/util.hpp b/src/util.hpp
index 84bf3ef..b1bc1cc 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -1,4 +1,4 @@
-/* $Id: util.hpp,v 1.25 2007-05-09 21:23:09 adam Exp $
+/* $Id: util.hpp,v 1.26 2008-01-29 16:51:12 adam Exp $
    Copyright (c) 2005-2007, Index Data.
 
 This file is part of Metaproxy.
@@ -90,7 +90,7 @@ namespace metaproxy_1 {
         void set_vhost_otherinfo(Z_OtherInformation **otherInformation, 
                                  ODR odr,
                                  const std::string vhost, 
-                                 const int cat = 1 );
+                                 const int cat);
 
         void set_vhost_otherinfo(Z_OtherInformation **otherInformation,
                                  ODR odr,