X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffilter_virt_db.cpp;h=98ed55ac734bda8a3d4352169179ac4457efadb0;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=ad60d25caecb452e4fdb0fbd8d8c1ce1a3b0d2e0;hpb=a1ef872694c141f21afdbb3e0798b60fc1421429;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index ad60d25..98ed55a 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_virt_db.cpp,v 1.30 2006-01-17 13:54:54 adam Exp $
+/* $Id: filter_virt_db.cpp,v 1.33 2006-01-18 10:57:27 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -56,6 +56,7 @@ namespace yp2 {
             yp2::Session m_session;
             bool m_is_virtual;
             bool m_in_use;
+            yazpp_1::GDU m_init_gdu;
             std::list<BackendPtr> m_backend_list;
             std::map<std::string,Virt_db::Set> m_sets;
 
@@ -173,16 +174,19 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
 
     Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest);
 
-    std::list<std::string>::const_iterator t_it = b->m_targets.begin();
-    int cat = 1;
-    for (; t_it != b->m_targets.end(); t_it++, cat++)
-    {
-        yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr,
-                                 VAL_PROXY, cat, t_it->c_str());
-    }
-        
+    yp2::util::set_vhost_otherinfo(&init_apdu->u.initRequest->otherInfo, odr,
+                                   b->m_targets);
     Z_InitRequest *req = init_apdu->u.initRequest;
 
+    // copy stuff from Frontend Init Request
+    Z_GDU *org_gdu = m_init_gdu.get();
+    Z_InitRequest *org_init = org_gdu->u.z3950->u.initRequest;
+
+    req->idAuthentication = org_init->idAuthentication;
+    req->implementationId = org_init->implementationId;
+    req->implementationName = org_init->implementationName;
+    req->implementationVersion = org_init->implementationVersion;
+
     ODR_MASK_SET(req->options, Z_Options_search);
     ODR_MASK_SET(req->options, Z_Options_present);
     ODR_MASK_SET(req->options, Z_Options_namedResultSets);
@@ -195,24 +199,24 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
     init_package.request() = init_apdu;
     
     init_package.move(b->m_route);  // sending init 
-    
-    if (init_package.session().is_closed())
-    {
-        error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        // addinfo = database;
-        BackendPtr null;
-        return null;
-    }
+
     Z_GDU *gdu = init_package.response().get();
     // we hope to get an init response
     if (gdu && gdu->which == Z_GDU_Z3950 && gdu->u.z3950->which ==
         Z_APDU_initResponse)
     {
-        if (ODR_MASK_GET(gdu->u.z3950->u.initResponse->options,
-                         Z_Options_namedResultSets))
+        Z_InitResponse *res = gdu->u.z3950->u.initResponse;
+        if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
         {
             b->m_named_result_sets = true;
         }
+        std::cout << "GOT INIT res=" << *res->result << "\n";
+        if (!*res->result)
+        {
+            yp2::util::get_init_diagnostics(res, error_code, addinfo);
+            BackendPtr null;
+            return null; 
+        }
     }
     else
     {
@@ -221,6 +225,14 @@ yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
         BackendPtr null;
         return null;
     }        
+    if (init_package.session().is_closed())
+    {
+        error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+        // addinfo = database;
+        BackendPtr null;
+        return null;
+    }
+
     m_backend_list.push_back(b);
     return b;
 }
@@ -588,10 +600,12 @@ void yf::Virt_db::process(Package &package) const
     {
         Z_InitRequest *req = gdu->u.z3950->u.initRequest;
         
-        const char *vhost =
-            yaz_oi_get_string_oidval(&req->otherInfo, VAL_PROXY, 1, 0);
-        if (!vhost)
+        std::list<std::string> vhosts;
+        yp2::util::get_vhost_otherinfo(&req->otherInfo, false, vhosts);
+        if (vhosts.size() == 0)
         {
+            f->m_init_gdu = gdu;
+            
             yp2::odr odr;
             Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
             Z_InitResponse *resp = apdu->u.initResponse;