X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Frouter_chain.cpp;h=318254a48ef4cbf6b2e7aaef2058fe46561bd6f4;hb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;hp=cf495443f32170f91d02f657b692e42dc7badd56;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/router_chain.cpp b/src/router_chain.cpp
index cf49544..318254a 100644
--- a/src/router_chain.cpp
+++ b/src/router_chain.cpp
@@ -1,14 +1,16 @@
-/* $Id: router_chain.cpp,v 1.3 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: router_chain.cpp,v 1.8 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
    
-   %LICENSE%
+      See the LICENSE file for details
 */
 
 #include "router_chain.hpp"
 
 #include <list>
 
-namespace yp2 
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1
 {
     class ChainPos;
 
@@ -17,81 +19,55 @@ namespace yp2
         friend class RouterChain::Pos;
         std::list<const filter::Base *> m_filter_list;
     };
-
-#if ROUTE_POS
     class RouterChain::Pos : public RoutePos {
     public:
-        virtual const filter::Base *move();
+        virtual const filter::Base *move(const char *route);
         virtual RoutePos *clone();
         virtual ~Pos();
         std::list<const filter::Base *>::const_iterator it;
-        yp2::RouterChain::Rep *m_p;
+        mp::RouterChain::Rep *m_p;
     };
-#endif
-};
+}
 
-yp2::RouterChain::RouterChain() : m_p(new yp2::RouterChain::Rep)
+mp::RouterChain::RouterChain() : m_p(new mp::RouterChain::Rep)
 {
 }
 
-yp2::RouterChain::~RouterChain()
+mp::RouterChain::~RouterChain()
 {
 }
 
-#if ROUTE_POS
-const yp2::filter::Base *yp2::RouterChain::Pos::move()
+const mp::filter::Base *mp::RouterChain::Pos::move(const char *route)
 {
     if (it == m_p->m_filter_list.end())
         return 0;
-    const yp2::filter::Base *f = *it;
+    const mp::filter::Base *f = *it;
     it++;
     return f;
 }
 
-yp2::RoutePos *yp2::RouterChain::createpos() const
+mp::RoutePos *mp::RouterChain::createpos() const
 {
-    yp2::RouterChain::Pos *p = new yp2::RouterChain::Pos;
+    mp::RouterChain::Pos *p = new mp::RouterChain::Pos;
     p->it = m_p->m_filter_list.begin();
     p->m_p = m_p.get();
     return p;
 }
 
-yp2::RoutePos *yp2::RouterChain::Pos::clone()
+mp::RoutePos *mp::RouterChain::Pos::clone()
 {
-    yp2::RouterChain::Pos *p = new yp2::RouterChain::Pos;
+    mp::RouterChain::Pos *p = new mp::RouterChain::Pos;
     p->it = it;
     p->m_p = m_p;
     return p;
 }
 
 
-yp2::RouterChain::Pos::~Pos()
+mp::RouterChain::Pos::~Pos()
 {
 }
-#else
-const yp2::filter::Base *yp2::RouterChain::move(const filter::Base *filter,
-                                                const Package *package) const {
-    std::list<const filter::Base *>::const_iterator it;
-    it = m_p->m_filter_list.begin();
-    if (filter)
-    {
-        for (; it != m_p->m_filter_list.end(); it++)
-            if (*it == filter)
-            {
-                it++;
-                break;
-            }
-    }
-    if (it == m_p->m_filter_list.end())
-    {
-        //throw RouterException("no routing rules known");
-        return 0;
-    }
-    return *it;
-}
-#endif
 
-yp2::RouterChain & yp2::RouterChain::append(const filter::Base &filter)
+mp::RouterChain & mp::RouterChain::append(const filter::Base &filter)
 {
     m_p->m_filter_list.push_back(&filter);
     return *this;