X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Frouter_flexml.cpp;h=2abdfa8ca7abab83b345b184cd225793b4948857;hb=14d0e634d5061208301502d813d488d1e82f190b;hp=aa4257a686075e5653165f5aec404681650f1c95;hpb=5cc9145ea95e0a778bef7ad2a0ea9c1a4824bcc4;p=metaproxy-moved-to-github.git diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp index aa4257a..2abdfa8 100644 --- a/src/router_flexml.cpp +++ b/src/router_flexml.cpp @@ -1,11 +1,13 @@ -/* $Id: router_flexml.cpp,v 1.2 2005-11-10 23:10:42 adam Exp $ +/* $Id: router_flexml.cpp,v 1.9 2006-01-04 14:30:51 adam Exp $ Copyright (c) 2005, Index Data. %LICENSE% */ - +#include "config.hpp" #include "router_flexml.hpp" +#include "factory_filter.hpp" +#include "factory_static.hpp" #include #include @@ -17,179 +19,233 @@ #include #include + namespace yp2 { class RouterFleXML::Rep { friend class RouterFleXML; Rep(); + typedef std::map > + IdFilterMap ; - 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 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(xmlDocPtr doc); + + bool is_element(const xmlNode *ptr, + const std::string &ns, + const std::string &name); + bool is_element_yp2(const xmlNode *ptr, + const std::string &name); + + bool check_element_yp2(const xmlNode *ptr, + const std::string &name); - 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(const xmlNode* node, int xml_node_type); - 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; - } + const xmlNode* jump_to_next(const xmlNode* node, int xml_node_type); - 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* jump_to_children(const xmlNode* node, int xml_node_type); + bool m_xinclude; + private: + FactoryFilter *m_factory; // TODO shared_ptr + }; +} + +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* 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; +} + +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; +} + +bool yp2::RouterFleXML::Rep::is_element(const xmlNode *ptr, + const std::string &ns, + const std::string &name) +{ + if (ptr && ptr->type == XML_ELEMENT_NODE && ptr->ns && ptr->ns->href + && !xmlStrcmp(BAD_CAST ns.c_str(), ptr->ns->href) + && !xmlStrcmp(BAD_CAST name.c_str(), ptr->name)) + return true; + return false; +} + +bool yp2::RouterFleXML::Rep::is_element_yp2(const xmlNode *ptr, + const std::string &name) +{ + return is_element(ptr, "http://indexdata.dk/yp2/config/1", name); +} + +bool yp2::RouterFleXML::Rep::check_element_yp2(const xmlNode *ptr, + const std::string &name) +{ + if (!is_element_yp2(ptr, name)) + throw XMLError("Error. Expected element name " + name); + return true; +} + +void yp2::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc) +{ + if (!doc) + throw XMLError("Empty XML Document"); + + const xmlNode* root = xmlDocGetRootElement(doc); + + check_element_yp2(root, "yp2"); + + 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_element_yp2(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_element_yp2(node, "filters"); + std::cout << "processing /yp2/filters" << std::endl; + + // process nodes in next level + const xmlNode* node2 = jump_to_children(node, XML_ELEMENT_NODE); + + unsigned int filter_nr = 0; + while(node2 && check_element_yp2(node2, "filter")) + { + filter_nr++; + std::cout << "processing /yp2/filters/filter[" + << filter_nr << "]" << std::endl; + + const struct _xmlAttr *attr; + std::string id_value; + std::string type_value; + for (attr = node2->properties; attr; attr = attr->next) + { + std::string name = std::string((const char *) attr->name); + std::string value; + + if (attr->children && attr->children->type == XML_TEXT_NODE) + value = std::string((const char *)attr->children->content); + + if (name == "id") + id_value = value; + else if (name == "type") + type_value = value; + else + throw XMLError("Error. Only attribute id or type allowed in filter element. Got " + name); + + std::cout << "attr " << name << "=" << value << "\n"; + + //const xmlNode *val; } + + yp2::filter::Base* filter_base = m_factory->create(type_value); + + filter_base->configure(node2); + + if (m_id_filter_map.find(id_value) != m_id_filter_map.end()) + throw XMLError("Filter " + id_value + " already defined"); + + m_id_filter_map[id_value] = + boost::shared_ptr(filter_base); + + 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_element_yp2(node, "routes"); + std::cout << "processing /yp2/routes" << std::endl; + + // process nodes in next level + node2 = jump_to_children(node, XML_ELEMENT_NODE); + check_element_yp2(node2, "route"); + + unsigned int route_nr = 0; + while(is_element_yp2(node2, "router")) + { + 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); - 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 "); + unsigned int filter3_nr = 0; + while(node3 && check_element_yp2(node3, "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; +} -yp2::RouterFleXML::Rep::Rep() : m_xmlconf(""), m_xinclude(false), m_xmlconf_doc(0) +yp2::RouterFleXML::Rep::Rep() : + m_xinclude(false) { } -yp2::RouterFleXML::RouterFleXML(std::string xmlconf) +yp2::RouterFleXML::RouterFleXML(std::string xmlconf, yp2::FactoryFilter &factory) : m_p(new Rep) { + + m_p->m_factory = &factory; + LIBXML_TEST_VERSION; - m_p->m_xmlconf = xmlconf; - - m_p->m_xmlconf_doc = xmlParseMemory(m_p->m_xmlconf.c_str(), m_p->m_xmlconf.size()); - - m_p->parse_xml_config_dom(); + xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(), + xmlconf.size()); + if (!doc) + throw XMLError("xmlParseMemory failed"); + else + { + m_p->parse_xml_config_dom(doc); + xmlFreeDoc(doc); + } } yp2::RouterFleXML::~RouterFleXML() { - xmlFreeDoc(m_p->m_xmlconf_doc); } const yp2::filter::Base * @@ -200,7 +256,6 @@ yp2::RouterFleXML::move(const yp2::filter::Base *filter, } - /* * Local variables: * c-basic-offset: 4