X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_multi.cpp;h=fcf3f5b6260d1e6cca21089955fad7f41893122b;hb=0f91085e7a561979199a348aba002b265b8e4b48;hp=a03319ad3752b2913d36fcd8a8a4ffb26a5c5182;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/filter_multi.cpp b/src/filter_multi.cpp
index a03319a..fcf3f5b 100644
--- a/src/filter_multi.cpp
+++ b/src/filter_multi.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_multi.cpp,v 1.15 2006-03-16 10:40:59 adam Exp $
+/* $Id: filter_multi.cpp,v 1.17 2006-05-15 13:22:02 adam Exp $
    Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
@@ -98,8 +98,6 @@ namespace metaproxy_1 {
             FrontendPtr get_frontend(Package &package);
             void release_frontend(Package &package);
         private:
-            boost::mutex m_sessions_mutex;
-            std::map<std::string, Multi::Map>m_maps;
             std::map<std::string,std::string> m_target_route;
             boost::mutex m_mutex;
             boost::condition m_cond_session_ready;
@@ -108,8 +106,6 @@ namespace metaproxy_1 {
     }
 }
 
-using namespace mp;
-
 bool yf::Multi::BackendSet::operator < (const BackendSet &k) const
 {
     return m_count < k.m_count;
@@ -203,13 +199,6 @@ yf::Multi::~Multi() {
 }
 
 
-void yf::Multi::add_map_host2hosts(std::string host,
-                                   std::list<std::string> hosts,
-                                   std::string route)
-{
-    m_p->m_maps[host] = Multi::Map(hosts, route);
-}
-
 void yf::Multi::Backend::operator() (void) 
 {
     m_package->move(m_route);
@@ -1098,36 +1087,6 @@ void mp::filter::Multi::configure(const xmlNode * ptr)
             std::cout << "route=" << route << " target=" << target << "\n";
             m_p->m_target_route[target] = route;
         }
-        else if (!strcmp((const char *) ptr->name, "virtual"))
-        {
-            std::list<std::string> targets;
-            std::string vhost;
-            xmlNode *v_node = ptr->children;
-            for (; v_node; v_node = v_node->next)
-            {
-                if (v_node->type != XML_ELEMENT_NODE)
-                    continue;
-                
-                if (mp::xml::is_element_yp2(v_node, "vhost"))
-                    vhost = mp::xml::get_text(v_node);
-                else if (mp::xml::is_element_yp2(v_node, "target"))
-                    targets.push_back(mp::xml::get_text(v_node));
-                else
-                    throw mp::filter::FilterException
-                        ("Bad element " 
-                         + std::string((const char *) v_node->name)
-                         + " in virtual section"
-                            );
-            }
-            std::string route = mp::xml::get_route(ptr);
-            add_map_host2hosts(vhost, targets, route);
-            std::list<std::string>::const_iterator it;
-            for (it = targets.begin(); it != targets.end(); it++)
-            {
-                std::cout << "Add " << vhost << "->" << *it
-                          << "," << route << "\n";
-            }
-        }
         else
         {
             throw mp::filter::FilterException