X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Frouter_chain.cpp;h=0114fd27e09e477b230aad55d0b3f4831a1bc7a3;hb=133c958c1d7ca2fc8d9b3297d24e27a8efa34993;hp=cf495443f32170f91d02f657b692e42dc7badd56;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/router_chain.cpp b/src/router_chain.cpp
index cf49544..0114fd2 100644
--- a/src/router_chain.cpp
+++ b/src/router_chain.cpp
@@ -1,4 +1,4 @@
-/* $Id: router_chain.cpp,v 1.3 2006-01-09 13:43:59 adam Exp $
+/* $Id: router_chain.cpp,v 1.5 2006-01-11 11:51:50 adam Exp $
    Copyright (c) 2005, Index Data.
    
    %LICENSE%
@@ -17,18 +17,15 @@ 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;
     };
-#endif
-};
+}
 
 yp2::RouterChain::RouterChain() : m_p(new yp2::RouterChain::Rep)
 {
@@ -38,8 +35,7 @@ yp2::RouterChain::~RouterChain()
 {
 }
 
-#if ROUTE_POS
-const yp2::filter::Base *yp2::RouterChain::Pos::move()
+const yp2::filter::Base *yp2::RouterChain::Pos::move(const char *route)
 {
     if (it == m_p->m_filter_list.end())
         return 0;
@@ -68,28 +64,6 @@ yp2::RoutePos *yp2::RouterChain::Pos::clone()
 yp2::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)
 {