X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Frouter_flexml.cpp;h=1ed6ce8c51a9c5481945386d90835431a6e64f17;hb=9b8466644a970341459fd3fe3b270defd337ed48;hp=c029fa2f15ed757216ec156a8fb4ddd014168ea3;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp
index c029fa2..1ed6ce8 100644
--- a/src/router_flexml.cpp
+++ b/src/router_flexml.cpp
@@ -1,7 +1,22 @@
-/* $Id: router_flexml.cpp,v 1.17 2006-03-16 10:40:59 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: router_flexml.cpp,v 1.22 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.
  */
 
 #include "config.hpp"
@@ -75,7 +90,7 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
                                                const xmlNode *node)
 {
     unsigned int filter_nr = 0;
-    while(node && mp::xml::check_element_yp2(node, "filter"))
+    while(node && mp::xml::check_element_mp(node, "filter"))
     {
         filter_nr++;
 
@@ -122,10 +137,10 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
 void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
                                               const xmlNode *node)
 {
-    mp::xml::check_element_yp2(node, "route");
+    mp::xml::check_element_mp(node, "route");
 
     unsigned int route_nr = 0;
-    while(mp::xml::is_element_yp2(node, "route"))
+    while(mp::xml::is_element_mp(node, "route"))
     {
         route_nr++;
 
@@ -153,7 +168,7 @@ void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
         const xmlNode* node3 = mp::xml::jump_to_children(node, XML_ELEMENT_NODE);
 
         unsigned int filter3_nr = 0;
-        while(node3 && mp::xml::check_element_yp2(node3, "filter"))
+        while(node3 && mp::xml::check_element_mp(node3, "filter"))
         {
             filter3_nr++;
             
@@ -224,17 +239,17 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc)
     
     const xmlNode* root = xmlDocGetRootElement(doc);
     
-    mp::xml::check_element_yp2(root,  "yp2");
+    mp::xml::check_element_mp(root,  "metaproxy");
 
     const xmlNode* node = mp::xml::jump_to_children(root, XML_ELEMENT_NODE);
 
-    if (mp::xml::is_element_yp2(node, "dlpath"))
+    if (mp::xml::is_element_mp(node, "dlpath"))
     {
         m_dl_path = mp::xml::get_text(node);
         node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
     }
     // process <start> node which is expected first element node
-    if (mp::xml::check_element_yp2(node, "start"))
+    if (mp::xml::check_element_mp(node, "start"))
     {
         const struct _xmlAttr *attr;
         std::string id_value;
@@ -255,7 +270,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc)
         node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
     }
     // process <filters> node if given
-    if (mp::xml::is_element_yp2(node, "filters"))
+    if (mp::xml::is_element_mp(node, "filters"))
     {
         parse_xml_filters(doc, mp::xml::jump_to_children(node,
                                                           XML_ELEMENT_NODE));
@@ -263,7 +278,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc)
         node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
     }
     // process <routes> node which is expected third element node
-    mp::xml::check_element_yp2(node, "routes");
+    mp::xml::check_element_mp(node, "routes");
     
     parse_xml_routes(doc, mp::xml::jump_to_children(node, XML_ELEMENT_NODE));
 
@@ -316,7 +331,7 @@ const mp::filter::Base *mp::RouterFleXML::Pos::move(const char *route)
 {
     if (route && *route)
     {
-        std::cout << "move to " << route << "\n";
+        //std::cout << "move to " << route << "\n";
         m_route_it = m_p->m_routes.find(route);
         if (m_route_it == m_p->m_routes.end())
         {