X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Frouter.hpp;h=e85d583e1dee7f77ec39f10e77cb080e1e98b57a;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=d92db4c0ed71a23dca03916b03940ce8f9f29fc8;hpb=b84218609efb976d5b5270bd9e95a3c421af3a13;p=metaproxy-moved-to-github.git

diff --git a/src/router.hpp b/src/router.hpp
index d92db4c..e85d583 100644
--- a/src/router.hpp
+++ b/src/router.hpp
@@ -1,98 +1,63 @@
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 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
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef ROUTER_HPP
 #define ROUTER_HPP
 
+#include <boost/noncopyable.hpp>
+#include <string>
 #include <stdexcept>
-#include <list>
 
-namespace yp2 {
+namespace metaproxy_1 
+{
     namespace filter {
         class Base;
     }
-    class Package;
+    class RoutePos;
     
     class RouterException : public std::runtime_error {
     public:
         RouterException(const std::string message)
             : std::runtime_error("RouterException: " + message){};
     };
-  
-    
-    class Router {
+      
+    class Router : boost::noncopyable {
     public:
         Router(){};
         virtual ~Router(){};
 
-        /// determines next Filter to use from current Filter and Package
-        virtual const filter::Base *move(const filter::Base *filter,
-                                   const Package *package) const {
-            return 0;
-        };
-
-        /// re-read configuration of routing tables
-        virtual void configure(){};
-
-        /// add routing rule expressed as Filter to Router
-        virtual Router & rule(const filter::Base &filter){
-            return *this;
-        }
-    private:
-        /// disabled because class is singleton
-        Router(const Router &);
-
-        /// disabled because class is singleton
-        Router& operator=(const Router &);
+        virtual RoutePos *createpos() const = 0;
     };
-  
-    
-    class RouterChain : public Router {
-    public:
-        RouterChain(){};
-        virtual ~RouterChain(){};
-        virtual const filter::Base *move(const filter::Base *filter,
-                                   const Package *package) const {
-            std::list<const filter::Base *>::const_iterator it;
-            it = m_filter_list.begin();
-            if (filter)
-                {
-                    for (; it != m_filter_list.end(); it++)
-                        if (*it == filter)
-                            {
-                                it++;
-                                break;
-                            }
-                }
-            if (it == m_filter_list.end())
-                {
-                    //throw RouterException("no routing rules known");
-                    return 0;
-                }
-            return *it;
-        };
-        virtual void configure(){};
-        RouterChain & rule(const filter::Base &filter){
-            m_filter_list.push_back(&filter);
-            return *this;
-        }
-    protected:
-        std::list<const filter::Base *> m_filter_list;
-    private:
-        /// disabled because class is singleton
-        RouterChain(const RouterChain &);
 
-        /// disabled because class is singleton
-        RouterChain& operator=(const RouterChain &);
+    class RoutePos : boost::noncopyable {
+    public:
+        virtual const filter::Base *move(const char *route) = 0;
+        virtual RoutePos *clone() = 0;
+        virtual ~RoutePos() {};
     };
-  
-
-  
 }
-
 #endif
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+