X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_virt_db.cpp;h=bd142a0a8dd17ffa77ca20eca4c1ab0d72797a77;hb=85189f2d04df4cfc8b16ee78187fb89d00dfe3ff;hp=fa2e5a1c440b9bdfd66b06d6fc1e41aeda71b18c;hpb=e372ad52d73479587bf08a53829b1025f734bda9;p=metaproxy-moved-to-github.git

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index fa2e5a1..bd142a0 100644
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,7 +1,27 @@
-/* $Id: filter_virt_db.cpp,v 1.25 2006-01-16 01:10:19 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_virt_db.cpp,v 1.54 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_virt_db.cpp,v 1.54 2008-02-20 15:07:52 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
+
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
@@ -23,12 +43,13 @@
 #include <map>
 #include <iostream>
 
-namespace yf = yp2::filter;
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
 
-namespace yp2 {
+namespace metaproxy_1 {
     namespace filter {
 
-        struct Virt_db::Set {
+        struct VirtualDB::Set {
             Set(BackendPtr b, std::string setname);
             Set();
             ~Set();
@@ -36,127 +57,159 @@ namespace yp2 {
             BackendPtr m_backend;
             std::string m_setname;
         };
-        struct Virt_db::Map {
-            Map(std::string vhost, std::string route);
+        struct VirtualDB::Map {
+            Map(std::list<std::string> targets, std::string route);
             Map();
-            std::string m_vhost;
+            std::list<std::string> m_targets;
             std::string m_route;
         };
-        struct Virt_db::Backend {
-            yp2::Session m_backend_session;
-            std::string m_backend_database;
-            std::string m_frontend_database;
-            std::string m_vhost;
+        struct VirtualDB::Backend {
+            mp::Session m_backend_session;
+            std::list<std::string> m_frontend_databases;
+            std::list<std::string> m_targets;
             std::string m_route;
             bool m_named_result_sets;
             int m_number_of_sets;
         };
-        struct Virt_db::Frontend {
+        struct VirtualDB::Frontend {
             Frontend(Rep *rep);
             ~Frontend();
-            yp2::Session m_session;
+            mp::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;
+            std::map<std::string,VirtualDB::Set> m_sets;
 
             void search(Package &package, Z_APDU *apdu);
             void present(Package &package, Z_APDU *apdu);
             void scan(Package &package, Z_APDU *apdu);
 
             void close(Package &package);
-            typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
+            typedef std::map<std::string,VirtualDB::Set>::iterator Sets_it;
 
-            BackendPtr lookup_backend_from_database(std::string database);
-            BackendPtr create_backend_from_database(std::string database);
+            void fixup_package(Package &p, BackendPtr b);
+            void fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
+                                  BackendPtr b);
+            void fixup_npr_records(ODR odr, Z_Records *records,
+                                   BackendPtr b);
+    
+            BackendPtr lookup_backend_from_databases(
+                std::list<std::string> databases);
+            BackendPtr create_backend_from_databases(
+                std::list<std::string> databases,
+                int &error_code,
+                std::string &failing_database);
             
-            BackendPtr init_backend(std::string database, Package &package,
+            BackendPtr init_backend(std::list<std::string> database,
+                                    Package &package,
                                     int &error_code, std::string &addinfo);
             Rep *m_p;
         };            
-        class Virt_db::Rep {
-            friend class Virt_db;
-            friend class Frontend;
+        class VirtualDB::Rep {
+            friend class VirtualDB;
+            friend struct Frontend;
             
             FrontendPtr get_frontend(Package &package);
             void release_frontend(Package &package);
         private:
-            boost::mutex m_sessions_mutex;
-            std::map<std::string, Virt_db::Map>m_maps;
-
-            typedef std::map<std::string,Virt_db::Set>::iterator Sets_it;
-
+            std::map<std::string, VirtualDB::Map>m_maps;
+            typedef std::map<std::string,VirtualDB::Set>::iterator Sets_it;
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
-            std::map<yp2::Session, FrontendPtr> m_clients;
+            std::map<mp::Session, FrontendPtr> m_clients;
         };
     }
 }
 
-using namespace yp2;
-
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::lookup_backend_from_database(
-    std::string database)
+yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::lookup_backend_from_databases(
+    std::list<std::string> databases)
 {
     std::list<BackendPtr>::const_iterator map_it;
     map_it = m_backend_list.begin();
     for (; map_it != m_backend_list.end(); map_it++)
-        if ((*map_it)->m_frontend_database == database)
+        if ((*map_it)->m_frontend_databases == databases)
             return *map_it;
     BackendPtr null;
     return null;
 }
 
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::create_backend_from_database(
-    std::string database)
+yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::create_backend_from_databases(
+    std::list<std::string> databases, int &error_code, std::string &addinfo)
 {
-    std::map<std::string, Virt_db::Map>::iterator map_it;
-    map_it = m_p->m_maps.find(database);
-    if (map_it == m_p->m_maps.end())
-    {
-        BackendPtr ptr;
-        return ptr;
-    }
     BackendPtr b(new Backend);
+    std::list<std::string>::const_iterator db_it = databases.begin();
 
     b->m_number_of_sets = 0;
-    b->m_frontend_database = database;
+    b->m_frontend_databases = databases;
     b->m_named_result_sets = false;
-    b->m_route = map_it->second.m_route;
-    b->m_vhost = map_it->second.m_vhost;
-    const char *sep = strchr(b->m_vhost.c_str(), '/');
-    std::string backend_database;
-    if (sep)
-        b->m_backend_database = std::string(sep+1);
-    else
-        b->m_backend_database = database;
 
+    bool first_route = true;
+
+    std::map<std::string,bool> targets_dedup;
+    for (; db_it != databases.end(); db_it++)
+    {
+        std::map<std::string, VirtualDB::Map>::iterator map_it;
+        map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
+        if (map_it == m_p->m_maps.end())  // database not found
+        {
+            error_code = YAZ_BIB1_DATABASE_DOES_NOT_EXIST;
+            addinfo = *db_it;
+            BackendPtr ptr;
+            return ptr;
+        }
+        std::list<std::string>::const_iterator t_it =
+            map_it->second.m_targets.begin();
+        for (; t_it != map_it->second.m_targets.end(); t_it++) {
+            if (!targets_dedup[*t_it])
+            {
+                targets_dedup[*t_it] = true;
+                b->m_targets.push_back(*t_it);
+            }
+        }
+
+        // see if we have a route conflict.
+        if (!first_route && b->m_route != map_it->second.m_route)
+        {
+            // we have a conflict.. 
+            error_code =  YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
+            BackendPtr ptr;
+            return ptr;
+        }
+        b->m_route = map_it->second.m_route;
+        first_route = false;
+    }
     return b;
 }
 
-yf::Virt_db::BackendPtr yf::Virt_db::Frontend::init_backend(
-    std::string database, Package &package,
+yf::VirtualDB::BackendPtr yf::VirtualDB::Frontend::init_backend(
+    std::list<std::string> databases, mp::Package &package,
     int &error_code, std::string &addinfo)
 {
-    BackendPtr b = create_backend_from_database(database);
+    BackendPtr b = create_backend_from_databases(databases, error_code,
+                                                 addinfo);
     if (!b)
-    {
-        error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        addinfo = database;
         return b;
-    }
     Package init_package(b->m_backend_session, package.origin());
     init_package.copy_filter(package);
 
-    yp2::odr odr;
+    mp::odr odr;
 
     Z_APDU *init_apdu = zget_APDU(odr, Z_APDU_initRequest);
-    
-    yaz_oi_set_string_oidval(&init_apdu->u.initRequest->otherInfo, odr,
-                             VAL_PROXY, 1, b->m_vhost.c_str());
-    
+
+    mp::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);
@@ -169,54 +222,55 @@ 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;
         }
+        if (!*res->result)
+        {
+            error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
+            mp::util::get_init_diagnostics(res, error_code, addinfo);
+            BackendPtr null;
+            return null; 
+        }
     }
     else
     {
         error_code = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        addinfo = database;
+        // addinfo = database;
         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;
 }
 
-void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
+void yf::VirtualDB::Frontend::search(mp::Package &package, Z_APDU *apdu_req)
 {
     Z_SearchRequest *req = apdu_req->u.searchRequest;
     std::string vhost;
     std::string resultSetId = req->resultSetName;
-    yp2::odr odr;
-
-    // only one datatabase for now
-    if (req->num_databaseNames != 1)
-    {   // exactly one database must be specified
-        Z_APDU *apdu =
-            odr.create_searchResponse(
-                apdu_req, YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0);
-        package.response() = apdu;
-        
-        return;
-    }
-    std::string database = std::string(req->databaseNames[0]);
+    mp::odr odr;
+
+    std::list<std::string> databases;
+    int i;
+    for (i = 0; i<req->num_databaseNames; i++)
+        databases.push_back(req->databaseNames[i]);
 
     BackendPtr b; // null for now
     Sets_it sets_it = m_sets.find(req->resultSetName);
@@ -244,7 +298,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
         for (; map_it != m_backend_list.end(); map_it++)
         {
             BackendPtr tmp = *map_it;
-            if (tmp->m_frontend_database == database)
+            if (tmp->m_frontend_databases == databases)
                 break;
         }
         if (map_it != m_backend_list.end()) 
@@ -261,7 +315,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
         for (; map_it != m_backend_list.end(); map_it++)
         {
             BackendPtr tmp = *map_it;
-            if (tmp->m_frontend_database == database &&
+            if (tmp->m_frontend_databases == databases &&
                 (tmp->m_named_result_sets ||
                  tmp->m_number_of_sets == 0))
                 break;
@@ -273,7 +327,7 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
     {
         int error_code;
         std::string addinfo;
-        b = init_backend(database, package, error_code, addinfo);
+        b = init_backend(databases, package, error_code, addinfo);
         if (!b)
         {
             // did not get a backend (unavailable somehow?)
@@ -302,8 +356,14 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
         req->resultSetName = odr_strdup(odr, backend_setname.c_str());
     }
 
-    const char *backend_database = b->m_backend_database.c_str();
-    req->databaseNames[0] = odr_strdup(odr, backend_database);
+    // pick first targets spec and move the databases from it ..
+    std::list<std::string>::const_iterator t_it = b->m_targets.begin();
+    if (t_it != b->m_targets.end())
+    {
+        mp::util::set_databases_from_zurl(odr, *t_it,
+                                                &req->num_databaseNames,
+                                                &req->databaseNames);
+    }
 
     *req->replaceIndicator = 1;
 
@@ -313,27 +373,24 @@ void yf::Virt_db::Frontend::search(Package &package, Z_APDU *apdu_req)
 
     if (search_package.session().is_closed())
     {
-        Z_APDU *apdu = 
-            odr.create_searchResponse(
-                apdu_req,
-                YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
-        package.response() = apdu;
+        package.response() = search_package.response();
+        package.session().close();
         return;
     }
-    package.response() = search_package.response();
-
     b->m_number_of_sets++;
 
-    m_sets[resultSetId] = Virt_db::Set(b, backend_setname);
+    m_sets[resultSetId] = VirtualDB::Set(b, backend_setname);
+    fixup_package(search_package, b);
+    package.response() = search_package.response();
 }
 
-yf::Virt_db::Frontend::Frontend(Rep *rep)
+yf::VirtualDB::Frontend::Frontend(Rep *rep)
 {
     m_p = rep;
     m_is_virtual = false;
 }
 
-void yf::Virt_db::Frontend::close(Package &package)
+void yf::VirtualDB::Frontend::close(mp::Package &package)
 {
     std::list<BackendPtr>::const_iterator b_it;
     
@@ -347,15 +404,15 @@ void yf::Virt_db::Frontend::close(Package &package)
     m_backend_list.clear();
 }
 
-yf::Virt_db::Frontend::~Frontend()
+yf::VirtualDB::Frontend::~Frontend()
 {
 }
 
-yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package)
+yf::VirtualDB::FrontendPtr yf::VirtualDB::Rep::get_frontend(mp::Package &package)
 {
     boost::mutex::scoped_lock lock(m_mutex);
 
-    std::map<yp2::Session,yf::Virt_db::FrontendPtr>::iterator it;
+    std::map<mp::Session,yf::VirtualDB::FrontendPtr>::iterator it;
     
     while(true)
     {
@@ -376,10 +433,10 @@ yf::Virt_db::FrontendPtr yf::Virt_db::Rep::get_frontend(Package &package)
     return f;
 }
 
-void yf::Virt_db::Rep::release_frontend(Package &package)
+void yf::VirtualDB::Rep::release_frontend(mp::Package &package)
 {
     boost::mutex::scoped_lock lock(m_mutex);
-    std::map<yp2::Session,yf::Virt_db::FrontendPtr>::iterator it;
+    std::map<mp::Session,yf::VirtualDB::FrontendPtr>::iterator it;
     
     it = m_clients.find(package.session());
     if (it != m_clients.end())
@@ -397,42 +454,118 @@ void yf::Virt_db::Rep::release_frontend(Package &package)
     }
 }
 
-yf::Virt_db::Set::Set(BackendPtr b, std::string setname)
+yf::VirtualDB::Set::Set(BackendPtr b, std::string setname)
     :  m_backend(b), m_setname(setname)
 {
 }
 
 
-yf::Virt_db::Set::Set()
+yf::VirtualDB::Set::Set()
 {
 }
 
 
-yf::Virt_db::Set::~Set()
+yf::VirtualDB::Set::~Set()
 {
 }
 
-yf::Virt_db::Map::Map(std::string vhost, std::string route)
-    : m_vhost(vhost), m_route(route) 
+yf::VirtualDB::Map::Map(std::list<std::string> targets, std::string route)
+    : m_targets(targets), m_route(route) 
 {
 }
 
-yf::Virt_db::Map::Map()
+yf::VirtualDB::Map::Map()
 {
 }
 
-yf::Virt_db::Virt_db() : m_p(new Virt_db::Rep)
+yf::VirtualDB::VirtualDB() : m_p(new VirtualDB::Rep)
 {
 }
 
-yf::Virt_db::~Virt_db() {
+yf::VirtualDB::~VirtualDB() {
 }
 
-void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
+void yf::VirtualDB::Frontend::fixup_npr_record(ODR odr, Z_NamePlusRecord *npr,
+                                             BackendPtr b)
+{
+    if (npr->databaseName)
+    {
+        std::string b_database = std::string(npr->databaseName);
+
+        // consider each of the frontend databases..
+        std::list<std::string>::const_iterator db_it;
+        for (db_it = b->m_frontend_databases.begin(); 
+             db_it != b->m_frontend_databases.end(); db_it++)
+        {
+            // see which target it corresponds to.. (if any)
+            std::map<std::string,VirtualDB::Map>::const_iterator map_it;
+
+            map_it = m_p->m_maps.find(mp::util::database_name_normalize(*db_it));
+            if (map_it != m_p->m_maps.end())
+            { 
+                VirtualDB::Map m = map_it->second;
+                
+                std::list<std::string>::const_iterator t;
+                for (t = m.m_targets.begin(); t != m.m_targets.end(); t++)
+                {
+                    if (*t == b_database)
+                    {
+                        npr->databaseName = odr_strdup(odr, (*db_it).c_str());
+                        return;
+                    }
+                }
+            }
+            
+        }
+        db_it = b->m_frontend_databases.begin();
+        if (db_it != b->m_frontend_databases.end())
+        {
+            std::string database = *db_it;
+            npr->databaseName = odr_strdup(odr, database.c_str());
+        }
+    }
+}
+
+void yf::VirtualDB::Frontend::fixup_npr_records(ODR odr, Z_Records *records,
+                                              BackendPtr b)
+{
+    if (records && records->which == Z_Records_DBOSD)
+    {
+        Z_NamePlusRecordList *nprlist = records->u.databaseOrSurDiagnostics;
+        int i;
+        for (i = 0; i < nprlist->num_records; i++)
+        {
+            fixup_npr_record(odr, nprlist->records[i], b);
+        }
+    }
+}
+
+void yf::VirtualDB::Frontend::fixup_package(mp::Package &p, BackendPtr b)
+{
+    Z_GDU *gdu = p.response().get();
+    mp::odr odr;
+
+    if (gdu && gdu->which == Z_GDU_Z3950)
+    {
+        Z_APDU *apdu = gdu->u.z3950;
+        if (apdu->which == Z_APDU_presentResponse)
+        {
+            fixup_npr_records(odr, apdu->u.presentResponse->records, b);
+            p.response() = gdu;
+        }
+        else if (apdu->which == Z_APDU_searchResponse)
+        {
+            fixup_npr_records(odr,  apdu->u.searchResponse->records, b);
+            p.response() = gdu;
+        }
+    }
+}
+
+void yf::VirtualDB::Frontend::present(mp::Package &package, Z_APDU *apdu_req)
 {
     Z_PresentRequest *req = apdu_req->u.presentRequest;
     std::string resultSetId = req->resultSetId;
-    yp2::odr odr;
+    mp::odr odr;
 
     Sets_it sets_it = m_sets.find(resultSetId);
     if (sets_it == m_sets.end())
@@ -446,26 +579,25 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
         return;
     }
     Session *id =
-        new yp2::Session(sets_it->second.m_backend->m_backend_session);
+        new mp::Session(sets_it->second.m_backend->m_backend_session);
     
     // sending present to backend
     Package present_package(*id, package.origin());
     present_package.copy_filter(package);
+
+    req->resultSetId = odr_strdup(odr, sets_it->second.m_setname.c_str());
     
-    req->resultSetId = odr_strdup(odr, "default");
     present_package.request() = yazpp_1::GDU(apdu_req);
 
-    present_package.move();
+    present_package.move(sets_it->second.m_backend->m_route);
+
+    fixup_package(present_package, sets_it->second.m_backend);
 
     if (present_package.session().is_closed())
     {
-        Z_APDU *apdu = 
-            odr.create_presentResponse(
-                apdu_req,
-                YAZ_BIB1_RESULT_SET_NO_LONGER_EXISTS_UNILATERALLY_DELETED_BY_,
-                resultSetId.c_str());
-        package.response() = apdu;
-        m_sets.erase(resultSetId);
+        package.response() = present_package.response();
+        package.session().close();
+        return;
     }
     else
     {
@@ -474,24 +606,17 @@ void yf::Virt_db::Frontend::present(Package &package, Z_APDU *apdu_req)
     delete id;
 }
 
-void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req)
+void yf::VirtualDB::Frontend::scan(mp::Package &package, Z_APDU *apdu_req)
 {
     Z_ScanRequest *req = apdu_req->u.scanRequest;
     std::string vhost;
-    yp2::odr odr;
+    mp::odr odr;
+
+    std::list<std::string> databases;
+    int i;
+    for (i = 0; i<req->num_databaseNames; i++)
+        databases.push_back(req->databaseNames[i]);
 
-    // only one datatabase for now
-    if (req->num_databaseNames != 1)
-    {   // exactly one database must be specified
-        Z_APDU *apdu =
-            odr.create_scanResponse(
-                apdu_req,
-                YAZ_BIB1_TOO_MANY_DATABASES_SPECIFIED, 0);
-        package.response() = apdu;
-        return;
-    }
-    std::string database = std::string(req->databaseNames[0]);
-    
     BackendPtr b;
     // pick up any existing backend with a database match
     std::list<BackendPtr>::const_iterator map_it;
@@ -499,7 +624,7 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req)
     for (; map_it != m_backend_list.end(); map_it++)
     {
         BackendPtr tmp = *map_it;
-        if (tmp->m_frontend_database == database)
+        if (tmp->m_frontend_databases == databases)
             break;
     }
     if (map_it != m_backend_list.end()) 
@@ -508,7 +633,7 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req)
     {
         int error_code;
         std::string addinfo;
-        b = init_backend(database, package, error_code, addinfo);
+        b = init_backend(databases, package, error_code, addinfo);
         if (!b)
         {
             // did not get a backend (unavailable somehow?)
@@ -525,32 +650,49 @@ void yf::Virt_db::Frontend::scan(Package &package, Z_APDU *apdu_req)
 
     scan_package.copy_filter(package);
 
-    const char *backend_database = b->m_backend_database.c_str();
-    req->databaseNames[0] = odr_strdup(odr, backend_database);
-
+    // pick first targets spec and move the databases from it ..
+    std::list<std::string>::const_iterator t_it = b->m_targets.begin();
+    if (t_it != b->m_targets.end())
+    {
+        mp::util::set_databases_from_zurl(odr, *t_it,
+                                                &req->num_databaseNames,
+                                                &req->databaseNames);
+    }
     scan_package.request() = yazpp_1::GDU(apdu_req);
     
     scan_package.move(b->m_route);
 
     if (scan_package.session().is_closed())
     {
-        Z_APDU *apdu =
-            odr.create_scanResponse(
-                apdu_req, YAZ_BIB1_DATABASE_UNAVAILABLE, database.c_str());
-        package.response() = apdu;
+        package.response() = scan_package.response();
+        package.session().close();
         return;
     }
     package.response() = scan_package.response();
 }
 
 
-void yf::Virt_db::add_map_db2vhost(std::string db, std::string vhost,
-                                   std::string route)
+void yf::VirtualDB::add_map_db2targets(std::string db, 
+                                     std::list<std::string> targets,
+                                     std::string route)
 {
-    m_p->m_maps[db] = Virt_db::Map(vhost, route);
+    m_p->m_maps[mp::util::database_name_normalize(db)] 
+        = VirtualDB::Map(targets, route);
 }
 
-void yf::Virt_db::process(Package &package) const
+
+void yf::VirtualDB::add_map_db2target(std::string db, 
+                                    std::string target,
+                                    std::string route)
+{
+    std::list<std::string> targets;
+    targets.push_back(target);
+
+    m_p->m_maps[mp::util::database_name_normalize(db)]
+        = VirtualDB::Map(targets, route);
+}
+
+void yf::VirtualDB::process(mp::Package &package) const
 {
     FrontendPtr f = m_p->get_frontend(package);
 
@@ -561,11 +703,13 @@ 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;
+        mp::util::get_vhost_otherinfo(req->otherInfo, vhosts);
+        if (vhosts.size() == 0)
         {
-            yp2::odr odr;
+            f->m_init_gdu = gdu;
+            
+            mp::odr odr;
             Z_APDU *apdu = odr.create_initResponse(gdu->u.z3950, 0, 0);
             Z_InitResponse *resp = apdu->u.initResponse;
             
@@ -606,7 +750,7 @@ void yf::Virt_db::process(Package &package) const
         Z_APDU *apdu = gdu->u.z3950;
         if (apdu->which == Z_APDU_initRequest)
         {
-            yp2::odr odr;
+            mp::odr odr;
             
             package.response() = odr.create_close(
                 apdu,
@@ -627,9 +771,13 @@ void yf::Virt_db::process(Package &package) const
         {
             f->scan(package, apdu);
         }
+        else if (apdu->which == Z_APDU_close)
+        {
+            package.session().close();
+        }
         else
         {
-            yp2::odr odr;
+            mp::odr odr;
             
             package.response() = odr.create_close(
                 apdu, Z_Close_protocolError,
@@ -642,7 +790,7 @@ void yf::Virt_db::process(Package &package) const
 }
 
 
-void yp2::filter::Virt_db::configure(const xmlNode * ptr)
+void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
@@ -651,32 +799,30 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr)
         if (!strcmp((const char *) ptr->name, "virtual"))
         {
             std::string database;
-            std::string target;
+            std::list<std::string> targets;
             xmlNode *v_node = ptr->children;
             for (; v_node; v_node = v_node->next)
             {
                 if (v_node->type != XML_ELEMENT_NODE)
                     continue;
                 
-                if (yp2::xml::is_element_yp2(v_node, "database"))
-                    database = yp2::xml::get_text(v_node);
-                else if (yp2::xml::is_element_yp2(v_node, "target"))
-                    target = yp2::xml::get_text(v_node);
+                if (mp::xml::is_element_mp(v_node, "database"))
+                    database = mp::xml::get_text(v_node);
+                else if (mp::xml::is_element_mp(v_node, "target"))
+                    targets.push_back(mp::xml::get_text(v_node));
                 else
-                    throw yp2::filter::FilterException
+                    throw mp::filter::FilterException
                         ("Bad element " 
                          + std::string((const char *) v_node->name)
                          + " in virtual section"
                             );
             }
-            std::string route = yp2::xml::get_route(ptr);
-            add_map_db2vhost(database, target, route);
-            std::cout << "Add " << database << "->" << target
-                      << "," << route << "\n";
+            std::string route = mp::xml::get_route(ptr);
+            add_map_db2targets(database, targets, route);
         }
         else
         {
-            throw yp2::filter::FilterException
+            throw mp::filter::FilterException
                 ("Bad element " 
                  + std::string((const char *) ptr->name)
                  + " in virt_db filter");
@@ -684,13 +830,13 @@ void yp2::filter::Virt_db::configure(const xmlNode * ptr)
     }
 }
 
-static yp2::filter::Base* filter_creator()
+static mp::filter::Base* filter_creator()
 {
-    return new yp2::filter::Virt_db;
+    return new mp::filter::VirtualDB;
 }
 
 extern "C" {
-    struct yp2_filter_struct yp2_filter_virt_db = {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_virt_db = {
         0,
         "virt_db",
         filter_creator