From a10952094497d0d7d6faa232146a32fead857284 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 8 Dec 2005 15:10:34 +0000 Subject: [PATCH] no inline RouterFlexXML Rep functions --- src/router_flexml.cpp | 277 ++++++++++++++++++++++++++----------------------- 1 file changed, 145 insertions(+), 132 deletions(-) diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp index 944ec0c..a421930 100644 --- a/src/router_flexml.cpp +++ b/src/router_flexml.cpp @@ -1,10 +1,9 @@ -/* $Id: router_flexml.cpp,v 1.3 2005-11-14 23:35:22 adam Exp $ +/* $Id: router_flexml.cpp,v 1.4 2005-12-08 15:10:34 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% */ - #include "config.hpp" #include "router_flexml.hpp" @@ -23,156 +22,171 @@ namespace yp2 { friend class RouterFleXML; Rep(); - typedef std::map > IdFilterMap ; typedef std::list FilterIdList; typedef std::map IdRouteMap ; - std::string m_xmlconf; bool m_xinclude; xmlDoc * m_xmlconf_doc; IdFilterMap m_id_filter_map; FilterIdList m_filter_id_list; IdRouteMap m_id_route_map; - void xml_dom_error (const xmlNode* node, std::string msg) - { - std::cerr << "ERROR: " << msg << " <" - << node->name << ">" - << std::endl; - } + void xml_dom_error (const xmlNode* node, std::string msg); void create_filter(std::string type, const xmlDoc * xmldoc, - std::string id = "") - { - std::cout << "Created Filter type='" << type - << "' id='" << id << "'" << std::endl; - } - - void parse_xml_config_dom() { - - if (!m_xmlconf_doc){ - std::cerr << "XML configuration DOM pointer empty" << std::endl; - } - - const xmlNode* root = xmlDocGetRootElement(m_xmlconf_doc); - - if ((std::string((const char *) root->name) != "yp2") - || (std::string((const char *)(root->ns->href)) - != "http://indexdata.dk/yp2/config/1") - ) - xml_dom_error(root, - "expected , got "); - - - for (const struct _xmlAttr *attr = root->properties; attr; attr = attr->next) - { - if (std::string((const char *)attr->name) == "xmlns") - { - const xmlNode *val = attr->children; - if (std::string((const char *)val->content) - != "http://indexdata.dk/yp2/config/1") - xml_dom_error(root, - "expected xmlns=\"http://indexdata.dk/yp2/config/1\", got "); - } - } - std::cout << "processing /yp2" << std::endl; - - // process node which is expected first element node - const xmlNode* node = jump_to_children(root, XML_ELEMENT_NODE); - //for (; node && node->type != XML_ELEMENT_NODE; node = node->next) - // ; - - check_node_name(node, "start"); - std::cout << "processing /yp2/start" << std::endl; - - // process node which is expected second element node - node = jump_to_next(node, XML_ELEMENT_NODE); - check_node_name(node, "filters"); - std::cout << "processing /yp2/filters" << std::endl; - - // process nodes in next level - const xmlNode* node2 = jump_to_children(node, XML_ELEMENT_NODE); - check_node_name(node2, "filter"); - - unsigned int filter_nr = 0; - while(node2 && std::string((const char *)node2->name) == "filter"){ - filter_nr++; - std::cout << "processing /yp2/filters/filter[" - << filter_nr << "]" << std::endl; - node2 = jump_to_next(node2, XML_ELEMENT_NODE); - } - - // process node which is expected third element node - node = jump_to_next(node, XML_ELEMENT_NODE); - check_node_name(node, "routes"); - std::cout << "processing /yp2/routes" << std::endl; - - // process nodes in next level - node2 = jump_to_children(node, XML_ELEMENT_NODE); - check_node_name(node2, "route"); - - unsigned int route_nr = 0; - while(node2 && std::string((const char *)node2->name) == "route"){ - route_nr++; - std::cout << "processing /yp2/routes/route[" - << route_nr << "]" << std::endl; - - // process nodes in third level - const xmlNode* node3 - = jump_to_children(node2, XML_ELEMENT_NODE); - check_node_name(node3, "filter"); - - unsigned int filter3_nr = 0; - while(node3 && std::string((const char *)node3->name) == "filter"){ - filter3_nr++; - - std::cout << "processing /yp2/routes/route[" - << route_nr << "]/filter[" - << filter3_nr << "]" << std::endl; - - node3 = jump_to_next(node3, XML_ELEMENT_NODE); - - } - node2 = jump_to_next(node2, XML_ELEMENT_NODE); - } - - - } + std::string id = ""); + + void parse_xml_config_dom(); + const xmlNode* jump_to(const xmlNode* node, int xml_node_type); + + const xmlNode* jump_to_next(const xmlNode* node, int xml_node_type); - const xmlNode* jump_to(const xmlNode* node, int xml_node_type){ - for (; node && node->type != xml_node_type; node = node->next) - ; - return node; - } + const xmlNode* jump_to_children(const xmlNode* node, int xml_node_type); + void check_node_name(const xmlNode* node, std::string name); + }; +} - const xmlNode* jump_to_next(const xmlNode* node, int xml_node_type){ - node = node->next; - for (; node && node->type != xml_node_type; node = node->next) - ; - return node; - } +void yp2::RouterFleXML::Rep::check_node_name(const xmlNode* node, std::string name) +{ + if (std::string((const char *)node->name) + != name) + xml_dom_error(node, "expected <" + name + ">, got "); +} + +const xmlNode* yp2::RouterFleXML::Rep::jump_to_children(const xmlNode* node, int xml_node_type) +{ + node = node->children; + for (; node && node->type != xml_node_type; node = node->next) + ; + return node; +} - const xmlNode* jump_to_children(const xmlNode* node, int xml_node_type){ - node = node->children; - for (; node && node->type != xml_node_type; node = node->next) - ; - return node; - } +const xmlNode* yp2::RouterFleXML::Rep::jump_to_next(const xmlNode* node, int xml_node_type) +{ + node = node->next; + for (; node && node->type != xml_node_type; node = node->next) + ; + return node; +} - void check_node_name(const xmlNode* node, std::string name){ - if (std::string((const char *)node->name) - != name) - xml_dom_error(node, "expected <" + name + ">, got "); +const xmlNode* yp2::RouterFleXML::Rep::jump_to(const xmlNode* node, int xml_node_type) +{ + for (; node && node->type != xml_node_type; node = node->next) + ; + return node; +} + +void yp2::RouterFleXML::Rep::parse_xml_config_dom() +{ + if (!m_xmlconf_doc){ + std::cerr << "XML configuration DOM pointer empty" << std::endl; + } + + const xmlNode* root = xmlDocGetRootElement(m_xmlconf_doc); + + if ((std::string((const char *) root->name) != "yp2") + || (std::string((const char *)(root->ns->href)) + != "http://indexdata.dk/yp2/config/1") + ) + xml_dom_error(root, + "expected , got "); + + + for (const struct _xmlAttr *attr = root->properties; attr; attr = attr->next) + { + if (std::string((const char *)attr->name) == "xmlns") + { + const xmlNode *val = attr->children; + if (std::string((const char *)val->content) + != "http://indexdata.dk/yp2/config/1") + xml_dom_error(root, + "expected xmlns=\"http://indexdata.dk/yp2/config/1\", got "); + } + } + std::cout << "processing /yp2" << std::endl; + + // process node which is expected first element node + const xmlNode* node = jump_to_children(root, XML_ELEMENT_NODE); + //for (; node && node->type != XML_ELEMENT_NODE; node = node->next) + // ; + + check_node_name(node, "start"); + std::cout << "processing /yp2/start" << std::endl; + + // process node which is expected second element node + node = jump_to_next(node, XML_ELEMENT_NODE); + check_node_name(node, "filters"); + std::cout << "processing /yp2/filters" << std::endl; + + // process nodes in next level + const xmlNode* node2 = jump_to_children(node, XML_ELEMENT_NODE); + check_node_name(node2, "filter"); + + unsigned int filter_nr = 0; + while(node2 && std::string((const char *)node2->name) == "filter"){ + filter_nr++; + std::cout << "processing /yp2/filters/filter[" + << filter_nr << "]" << std::endl; + node2 = jump_to_next(node2, XML_ELEMENT_NODE); + } + + // process node which is expected third element node + node = jump_to_next(node, XML_ELEMENT_NODE); + check_node_name(node, "routes"); + std::cout << "processing /yp2/routes" << std::endl; + + // process nodes in next level + node2 = jump_to_children(node, XML_ELEMENT_NODE); + check_node_name(node2, "route"); + + unsigned int route_nr = 0; + while(node2 && std::string((const char *)node2->name) == "route"){ + route_nr++; + std::cout << "processing /yp2/routes/route[" + << route_nr << "]" << std::endl; + + // process nodes in third level + const xmlNode* node3 + = jump_to_children(node2, XML_ELEMENT_NODE); + check_node_name(node3, "filter"); + + unsigned int filter3_nr = 0; + while(node3 && std::string((const char *)node3->name) == "filter"){ + filter3_nr++; + + std::cout << "processing /yp2/routes/route[" + << route_nr << "]/filter[" + << filter3_nr << "]" << std::endl; + + node3 = jump_to_next(node3, XML_ELEMENT_NODE); + } - }; + node2 = jump_to_next(node2, XML_ELEMENT_NODE); + } +} + +void yp2::RouterFleXML::Rep::create_filter(std::string type, + const xmlDoc * xmldoc, + std::string id) +{ + std::cout << "Created Filter type='" << type + << "' id='" << id << "'" << std::endl; } +void yp2::RouterFleXML::Rep::xml_dom_error (const xmlNode* node, std::string msg) +{ + std::cerr << "ERROR: " << msg << " <" + << node->name << ">" + << std::endl; +} -yp2::RouterFleXML::Rep::Rep() : m_xmlconf(""), m_xinclude(false), m_xmlconf_doc(0) + +yp2::RouterFleXML::Rep::Rep() : + m_xmlconf(""), m_xinclude(false), m_xmlconf_doc(0) { } @@ -183,8 +197,8 @@ yp2::RouterFleXML::RouterFleXML(std::string xmlconf) m_p->m_xmlconf = xmlconf; - m_p->m_xmlconf_doc = xmlParseMemory(m_p->m_xmlconf.c_str(), m_p->m_xmlconf.size()); - + m_p->m_xmlconf_doc = xmlParseMemory(m_p->m_xmlconf.c_str(), + m_p->m_xmlconf.size()); m_p->parse_xml_config_dom(); } @@ -201,7 +215,6 @@ yp2::RouterFleXML::move(const yp2::filter::Base *filter, } - /* * Local variables: * c-basic-offset: 4 -- 1.7.10.4