X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Frouter_flexml.hpp;h=75b119f1f0bd35416445eb6941504d78bbe8e47f;hb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;hp=14e368c17ca2a12fd82a07278a3e154c7517be92;hpb=6ed3503878603e0bae8ab0ee62bf900b3a60f2ca;p=metaproxy-moved-to-github.git

diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp
index 14e368c..75b119f 100644
--- a/src/router_flexml.hpp
+++ b/src/router_flexml.hpp
@@ -1,30 +1,37 @@
-/* $Id: router_flexml.hpp,v 1.7 2005-12-08 15:34:08 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: router_flexml.hpp,v 1.14 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
    %LICENSE%
 */
 
+#ifndef ROUTER_FLEXML_HPP
+#define ROUTER_FLEXML_HPP
+
 #include "router.hpp"
 
+#include "factory_filter.hpp"
+
 #include <stdexcept>
 
 #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);
+        RouterFleXML(std::string xmlconf, metaproxy_1::FactoryFilter &factory);
+        RouterFleXML(xmlDocPtr doc, metaproxy_1::FactoryFilter &factory);
         
         ~RouterFleXML();
-        
-        virtual const filter::Base *move(const filter::Base *filter,
-                                         const Package *package) const;
-        class XMLError : public std::runtime_error {
+
+        virtual RoutePos *createpos() const;
+        class XMLError1 : public std::runtime_error {
         public:
-            XMLError(const std::string msg) :
+            XMLError1(const std::string msg) :
                 std::runtime_error("XMLError : " + msg) {} ;
         };
     private:
@@ -32,7 +39,7 @@ namespace yp2
     };
  
 };
-
+#endif
 
 /*
  * Local variables: