Clearer diagnostic.

[metaproxy-moved-to-github.git] / src / router_flexml.hpp

diff --git a/src/router_flexml.hpp b/src/router_flexml.hpp
index 14e368c..6cd78e4 100644 (file)
--- a/src/router_flexml.hpp
+++ b/src/router_flexml.hpp
@@ -1,11 +1,16 @@
-/* $Id: router_flexml.hpp,v 1.7 2005-12-08 15:34:08 adam Exp $
+/* $Id: router_flexml.hpp,v 1.13 2006-01-11 11:51:50 adam Exp $
    Copyright (c) 2005, 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>
@@ -15,16 +20,18 @@ namespace yp2
     class RouterFleXML : public yp2::Router 
     {
         class Rep;
+        class Route;
+        class Pos;
     public:
-        RouterFleXML(std::string xmlconf);
+        RouterFleXML(std::string xmlconf, yp2::FactoryFilter &factory);
+        RouterFleXML(xmlDocPtr doc, yp2::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: