X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Frouter_flexml.hpp;h=ba295889460c12ce00cbb3008ee9f77235d9d3da;hb=a715926f3a2dc33f605b119561ccac38322f1c7b;hp=d040664f014cfb0df6f7330f9514baf41791fcb6;hpb=ec5548301e2549fc0f8d2f962aade24cb6f90d1b;p=metaproxy-moved-to-github.git

diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp
index d040664..ba29588 100644
--- a/src/router_flexml.hpp
+++ b/src/router_flexml.hpp
@@ -1,9 +1,12 @@
-/* $Id: router_flexml.hpp,v 1.11 2006-01-09 13:43:59 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: router_flexml.hpp,v 1.16 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-   %LICENSE%
+      See the LICENSE file for details
 */
 
+#ifndef ROUTER_FLEXML_HPP
+#define ROUTER_FLEXML_HPP
+
 #include "router.hpp"
 
 #include "factory_filter.hpp"
@@ -12,29 +15,23 @@
 
 #include <boost/scoped_ptr.hpp>
 
-namespace yp2 
+namespace metaproxy_1 
 {
-    class RouterFleXML : public yp2::Router 
+    class RouterFleXML : public metaproxy_1::Router 
     {
         class Rep;
         class Route;
         class Pos;
     public:
-        RouterFleXML(std::string xmlconf, yp2::FactoryFilter &factory);
-        RouterFleXML(xmlDocPtr doc, yp2::FactoryFilter &factory);
+        RouterFleXML(std::string xmlconf, metaproxy_1::FactoryFilter &factory);
+        RouterFleXML(xmlDocPtr doc, metaproxy_1::FactoryFilter &factory);
         
         ~RouterFleXML();
 
-#if ROUTE_POS
         virtual RoutePos *createpos() const;
-#else
-        /// determines next Filter to use from current Filter and Package
-        virtual const filter::Base *move(const filter::Base *filter,
-                                         const Package *package) const;
-#endif
-        class XMLError : public std::runtime_error {
+        class XMLError1 : public std::runtime_error {
         public:
-            XMLError(const std::string msg) :
+            XMLError1(const std::string msg) :
                 std::runtime_error("XMLError : " + msg) {} ;
         };
     private:
@@ -42,7 +39,7 @@ namespace yp2
     };
  
 };
-
+#endif
 
 /*
  * Local variables: