add_map_db2target uses add_map_db2targets

[metaproxy-moved-to-github.git] / src / filter_virt_db.cpp

diff --git a/src/filter_virt_db.cpp b/src/filter_virt_db.cpp
index 9f17096..2b6a343 100644 (file)
--- a/src/filter_virt_db.cpp
+++ b/src/filter_virt_db.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2008 Index Data
+   Copyright (C) 2005-2009 Index Data
 
 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
@@ -15,11 +15,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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"
 
@@ -115,6 +110,7 @@ namespace metaproxy_1 {
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
             std::map<mp::Session, FrontendPtr> m_clients;
+            bool pass_vhosts;
         };
     }
 }
@@ -477,6 +473,7 @@ yf::VirtualDB::Map::Map()
 
 yf::VirtualDB::VirtualDB() : m_p(new VirtualDB::Rep)
 {
+    m_p->pass_vhosts = false;
 }
 
 yf::VirtualDB::~VirtualDB() {
@@ -685,8 +682,7 @@ void yf::VirtualDB::add_map_db2target(std::string db,
     std::list<std::string> targets;
     targets.push_back(target);
 
-    m_p->m_maps[mp::util::database_name_normalize(db)]
-        = VirtualDB::Map(targets, route);
+    add_map_db2targets(db, targets, route);
 }
 
 void yf::VirtualDB::process(mp::Package &package) const
@@ -702,7 +698,12 @@ void yf::VirtualDB::process(mp::Package &package) const
         
         std::list<std::string> vhosts;
         mp::util::get_vhost_otherinfo(req->otherInfo, vhosts);
-        if (vhosts.size() == 0)
+
+        if (vhosts.size() > 0 && m_p->pass_vhosts)
+        {
+            package.move();
+        }
+        else
         {
             f->m_init_gdu = gdu;
             
@@ -737,8 +738,6 @@ void yf::VirtualDB::process(mp::Package &package) const
             package.response() = apdu;
             f->m_is_virtual = true;
         }
-        else
-            package.move();
     }
     else if (!f->m_is_virtual)
         package.move();
@@ -793,7 +792,11 @@ void mp::filter::VirtualDB::configure(const xmlNode * ptr, bool test_only)
     {
         if (ptr->type != XML_ELEMENT_NODE)
             continue;
-        if (!strcmp((const char *) ptr->name, "virtual"))
+        if (!strcmp((const char *) ptr->name, "pass-vhosts"))
+        {
+            m_p->pass_vhosts = mp::xml::get_bool(ptr->children, false);
+        }
+        else if (!strcmp((const char *) ptr->name, "virtual"))
         {
             std::string database;
             std::list<std::string> targets;
@@ -844,8 +847,9 @@ extern "C" {
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+