X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Frouter.hpp;h=814f9f7bb8c03cbd2eec34aae9234a34b186a3a3;hb=637a685d61a9ff0e3f398a59da426979815c4d68;hp=480fe1fbb253f0b3bddd662ad2c946304c3d9370;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/router.hpp b/src/router.hpp
index 480fe1f..814f9f7 100644
--- a/src/router.hpp
+++ b/src/router.hpp
@@ -1,7 +1,22 @@
-/* $Id: router.hpp,v 1.8 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: router.hpp,v 1.14 2007-05-09 21:23:09 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+This file is part of Metaproxy.
+
+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 Metaproxy; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #ifndef ROUTER_HPP
@@ -11,18 +26,12 @@
 #include <string>
 #include <stdexcept>
 
-#define ROUTE_POS 1
-
-namespace yp2 
+namespace metaproxy_1 
 {
     namespace filter {
         class Base;
     }
-#if ROUTE_POS
     class RoutePos;
-#else
-    class Package;
-#endif
     
     class RouterException : public std::runtime_error {
     public:
@@ -35,25 +44,15 @@ namespace yp2
         Router(){};
         virtual ~Router(){};
 
-#if ROUTE_POS
         virtual RoutePos *createpos() const = 0;
-#else
-        /// determines next Filter to use from current Filter and Package
-        virtual const filter::Base *move(const filter::Base *filter,
-                                         const Package *package) const = 0;
-#endif
     };
 
-
-#if ROUTE_POS
-    class RoutePos {
+    class RoutePos : boost::noncopyable {
     public:
-        virtual const filter::Base *move() = 0;
+        virtual const filter::Base *move(const char *route) = 0;
         virtual RoutePos *clone() = 0;
         virtual ~RoutePos() {};
     };
-#endif
-
 }
 #endif
 /*