X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Frouter_flexml.cpp;h=a904d6efedde139d668b9fc49603ee200273c9d0;hb=8c9c3b0f7bf85453c42e418f4a740d570f2189c1;hp=3375a3339976e844107c2cc07bb12d7fcc6f1e47;hpb=b0c61b7f8b17d876c88347a96c246c47493140da;p=metaproxy-moved-to-github.git diff --git a/src/router_flexml.cpp b/src/router_flexml.cpp index 3375a33..a904d6e 100644 --- a/src/router_flexml.cpp +++ b/src/router_flexml.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2010 Index Data + Copyright (C) 2005-2011 Index Data 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 @@ -17,7 +17,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.hpp" -#include "xmlutil.hpp" +#include +#include #include "router_flexml.hpp" #include "factory_filter.hpp" #include "factory_static.hpp" @@ -26,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include @@ -47,7 +49,8 @@ namespace metaproxy_1 { friend class RouterFleXML::Pos; Rep(); - void base(xmlDocPtr doc, mp::FactoryFilter &factory, bool test_only); + void base(xmlDocPtr doc, mp::FactoryFilter &factory, bool test_only, + const char *file_include_path); typedef std::map > @@ -61,12 +64,14 @@ namespace metaproxy_1 { std::string m_dl_path; - void parse_xml_config_dom(xmlDocPtr doc, bool test_only); + void parse_xml_config_dom(xmlDocPtr doc, bool test_only, + const char *file_include_path); void parse_xml_filters(xmlDocPtr doc, const xmlNode *node, - bool test_only); + bool test_only, const char *file_include_path); void parse_xml_routes(xmlDocPtr doc, const xmlNode *node, - bool test_only); + bool test_only, const char *file_include_path); + void check_routes_in_filters(const xmlNode *n); bool m_xinclude; private: @@ -88,10 +93,11 @@ namespace metaproxy_1 { void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc, const xmlNode *node, - bool test_only) + bool test_only, + const char *file_include_path) { unsigned int filter_nr = 0; - while(node && mp::xml::check_element_mp(node, "filter")) + while (node && mp::xml::check_element_mp(node, "filter")) { filter_nr++; @@ -123,7 +129,7 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc, } mp::filter::Base* filter_base = m_factory->create(type_value); - filter_base->configure(node, test_only); + filter_base->configure(node, test_only, file_include_path); if (m_id_filter_map.find(id_value) != m_id_filter_map.end()) throw mp::XMLError("Filter " + id_value + " already defined"); @@ -137,12 +143,13 @@ void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc, void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc, const xmlNode *node, - bool test_only) + bool test_only, + const char *file_include_path) { mp::xml::check_element_mp(node, "route"); unsigned int route_nr = 0; - while(mp::xml::is_element_mp(node, "route")) + while (mp::xml::is_element_mp(node, "route")) { route_nr++; @@ -170,7 +177,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_mp(node3, "filter")) + while (node3 && mp::xml::check_element_mp(node3, "filter")) { filter3_nr++; @@ -215,7 +222,7 @@ void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc, } mp::filter::Base* filter_base = m_factory->create(type_value); - filter_base->configure(node3, test_only); + filter_base->configure(node3, test_only, file_include_path); route.m_list.push_back( boost::shared_ptr(filter_base)); @@ -234,13 +241,58 @@ void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc, } } +void mp::RouterFleXML::Rep::check_routes_in_filters(const xmlNode *node) +{ + while (node) + { + if (mp::xml::is_element_mp(node, "filter")) + { + const xmlNode *n = + mp::xml::jump_to_children(node, XML_ELEMENT_NODE); + while (n) + { + const struct _xmlAttr *attr; + // we assume thar that route attribute is only at one level + // below filter.. At least that works for multi and virt_db. + for (attr = n->properties; attr; attr = attr->next) + { + if (!strcmp((const char *) attr->name, "route")) + { + std::string value; + + if (attr->children && attr->children->type == XML_TEXT_NODE) + value = std::string((const char *)attr->children->content); + + std::map::iterator it; + it = m_routes.find(value); + if (it == m_routes.end()) + { + throw mp::XMLError("Route '" + value + "' does not exist"); + } + } + } + n = mp::xml::jump_to_next(n, XML_ELEMENT_NODE); + } + } + node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE); + } +} + void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc, - bool test_only) + bool test_only, + const char *file_include_path) { if (!doc) throw mp::XMLError("Empty XML Document"); const xmlNode* root = xmlDocGetRootElement(doc); + + if (file_include_path) + { + int r = yaz_xml_include_simple((xmlNode *) root, file_include_path); + if (r) + throw mp::XMLError("YAZ XML Include failed"); + } mp::xml::check_element_mp(root, "metaproxy"); @@ -255,7 +307,6 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc, if (mp::xml::check_element_mp(node, "start")) { const struct _xmlAttr *attr; - std::string id_value; for (attr = node->properties; attr; attr = attr->next) { std::string name = std::string((const char *) attr->name); @@ -267,7 +318,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc, if (name == "route") m_start_route = value; else - throw mp::XMLError("Only attribute start allowed" + throw mp::XMLError("Only attribute route allowed" " in element 'start'. Got " + name); } node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE); @@ -277,7 +328,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc, { parse_xml_filters(doc, mp::xml::jump_to_children(node, XML_ELEMENT_NODE), - test_only); + test_only, file_include_path); node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE); } @@ -285,7 +336,7 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc, mp::xml::check_element_mp(node, "routes"); parse_xml_routes(doc, mp::xml::jump_to_children(node, XML_ELEMENT_NODE), - test_only); + test_only, file_include_path); node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE); if (node) @@ -293,25 +344,50 @@ void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc, throw mp::XMLError("Unexpected element " + std::string((const char *)node->name)); } -} + + node = mp::xml::jump_to_children(root, XML_ELEMENT_NODE); + while (node) + { + if (mp::xml::is_element_mp(node, "filters")) + check_routes_in_filters( + mp::xml::jump_to_children(node, + XML_ELEMENT_NODE)); + else if (mp::xml::is_element_mp(node, "routes")) + { + const xmlNode* n = mp::xml::jump_to_children(node, + XML_ELEMENT_NODE); + while (n) + { + if (mp::xml::is_element_mp(n, "route")) + { + check_routes_in_filters( + mp::xml::jump_to_children(n, XML_ELEMENT_NODE)); + + } + n = mp::xml::jump_to_next(n, XML_ELEMENT_NODE); + } + } + node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE); + } +} mp::RouterFleXML::Rep::Rep() : m_xinclude(false) { } void mp::RouterFleXML::Rep::base(xmlDocPtr doc, mp::FactoryFilter &factory, - bool test_only) + bool test_only, const char *file_include_path) { m_factory = &factory; - parse_xml_config_dom(doc, test_only); + parse_xml_config_dom(doc, test_only, file_include_path); m_start_route = "start"; } mp::RouterFleXML::RouterFleXML(xmlDocPtr doc, mp::FactoryFilter &factory, - bool test_only) + bool test_only, const char *file_include_path) : m_p(new Rep) { - m_p->base(doc, factory, test_only); + m_p->base(doc, factory, test_only, file_include_path); } mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory, @@ -326,7 +402,7 @@ mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory, throw mp::XMLError("xmlParseMemory failed"); else { - m_p->base(doc, factory, test_only); + m_p->base(doc, factory, test_only, 0); xmlFreeDoc(doc); } } @@ -384,6 +460,23 @@ mp::RouterFleXML::Pos::~Pos() } +void mp::RouterFleXML::start() +{ + std::map::iterator route_it; + + route_it = m_p->m_routes.begin(); + while (route_it != m_p->m_routes.end()) + { + RouterFleXML::Route route = route_it->second; + + std::list >::iterator it; + + for (it = route.m_list.begin(); it != route.m_list.end(); it++) + (*it)->start(); + route_it++; + } +} + /* * Local variables: * c-basic-offset: 4