/* This file is part of Metaproxy.
- Copyright (C) 2005-2011 Index Data
+ Copyright (C) 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
void parse_xml_filters(xmlDocPtr doc, const xmlNode *node,
bool test_only, const char *file_include_path);
+ void parse_xml_filters1(xmlDocPtr doc, const xmlNode *node,
+ bool test_only, const char *file_include_path,
+ Route &route);
void parse_xml_routes(xmlDocPtr doc, const xmlNode *node,
bool test_only, const char *file_include_path);
void check_routes_in_filters(const xmlNode *n);
virtual ~Pos();
mp::RouterFleXML::Rep *m_p;
- std::map<std::string,
+ std::map<std::string,
RouterFleXML::Route>::iterator m_route_it;
std::list<boost::shared_ptr <const mp::filter::Base> >::iterator m_filter_it;
};
id_value = value;
else if (name == "type")
type_value = value;
+ else if (name == "base")
+ ;// Ignore XInclude base attribute.
else
throw mp::XMLError("Only attribute id or type allowed"
" in filter element. Got " + name);
type_value.c_str(), m_dl_path.c_str());
m_factory->add_creator_dl(type_value, m_dl_path);
}
- mp::filter::Base* filter_base = m_factory->create(type_value);
+ boost::shared_ptr<mp::filter::Base> fb(m_factory->create(type_value));
- filter_base->configure(node, test_only, file_include_path);
+ fb->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");
- m_id_filter_map[id_value] =
- boost::shared_ptr<mp::filter::Base>(filter_base);
+ m_id_filter_map[id_value] = fb;
node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
}
-void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
- const xmlNode *node,
- bool test_only,
- const char *file_include_path)
+void mp::RouterFleXML::Rep::parse_xml_filters1(xmlDocPtr doc,
+ const xmlNode *node,
+ bool test_only,
+ const char *file_include_path,
+ Route &route)
{
- mp::xml::check_element_mp(node, "route");
-
- unsigned int route_nr = 0;
- while (mp::xml::is_element_mp(node, "route"))
+ while (node)
{
- route_nr++;
-
- const struct _xmlAttr *attr;
- std::string id_value;
- for (attr = node->properties; attr; attr = attr->next)
+ if (mp::xml::is_element_mp(node, "filters"))
{
- 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
- throw mp::XMLError("Only attribute 'id' allowed for"
- " element 'route'."
- " Got " + name);
- }
-
- Route route;
-
- // process <filter> nodes in third level
- const xmlNode* node3 = mp::xml::jump_to_children(node, XML_ELEMENT_NODE);
+ const xmlNode* node1 =
+ mp::xml::jump_to_children(node, XML_ELEMENT_NODE);
- unsigned int filter3_nr = 0;
- while (node3 && mp::xml::check_element_mp(node3, "filter"))
+ parse_xml_filters1(doc, node1, test_only, file_include_path, route);
+ }
+ else if (mp::xml::check_element_mp(node, "filter"))
{
- filter3_nr++;
-
const struct _xmlAttr *attr;
std::string refid_value;
std::string type_value;
- for (attr = node3->properties; attr; attr = attr->next)
+ for (attr = node->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 == "refid")
refid_value = value;
else if (name == "type")
type_value = value;
+ else if (name == "base")
+ ;// Ignore XInclude base attribute.
else
throw mp::XMLError("Only attribute 'refid' or 'type'"
- " allowed for element 'filter'."
- " Got " + name);
+ " allowed for element 'filter'."
+ " Got " + name);
}
if (refid_value.length())
{
std::map<std::string,
- boost::shared_ptr<const mp::filter::Base > >::iterator it;
+ boost::shared_ptr<const mp::filter::Base > >::iterator it;
it = m_id_filter_map.find(refid_value);
if (it == m_id_filter_map.end())
throw mp::XMLError("Unknown filter refid "
- + refid_value);
+ + refid_value);
else
route.m_list.push_back(it->second);
}
}
mp::filter::Base* filter_base = m_factory->create(type_value);
- filter_base->configure(node3, test_only, file_include_path);
-
+ filter_base->configure(node, test_only, file_include_path);
+
route.m_list.push_back(
boost::shared_ptr<mp::filter::Base>(filter_base));
}
- node3 = mp::xml::jump_to_next(node3, XML_ELEMENT_NODE);
-
+
}
+ node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
+ }
+}
+
+
+void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
+ const xmlNode *node,
+ 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"))
+ {
+ route_nr++;
+
+ 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);
+ 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 == "base")
+ ;// Ignore XInclude base attribute.
+ else
+ throw mp::XMLError("Only attribute 'id' allowed for"
+ " element 'route'."
+ " Got " + name);
+ }
+
+ Route route;
+
+ // process <filter> / <filters> nodes in third level
+ const xmlNode* node3 = mp::xml::jump_to_children(node, XML_ELEMENT_NODE);
+
+
+
+ parse_xml_filters1(doc, node3, test_only, file_include_path, route);
+
std::map<std::string,RouterFleXML::Route>::iterator it;
it = m_routes.find(id_value);
if (it != m_routes.end())
{
while (node)
{
- if (mp::xml::is_element_mp(node, "filter"))
+ if (mp::xml::is_element_mp(node, "filters"))
+ {
+ const xmlNode *n =
+ mp::xml::jump_to_children(node, XML_ELEMENT_NODE);
+ check_routes_in_filters(n);
+ }
+ else if (mp::xml::is_element_mp(node, "filter"))
{
const xmlNode *n =
mp::xml::jump_to_children(node, XML_ELEMENT_NODE);
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<std::string,RouterFleXML::Route>::iterator it;
it = m_routes.find(value);
if (it == m_routes.end())
{
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);
+ int r = yaz_xml_include_glob((xmlNode *) root, file_include_path,
+ YAZ_FILE_GLOB_FAIL_NOTEXIST);
if (r)
throw mp::XMLError("YAZ XML Include failed");
}
-
+
mp::xml::check_element_mp(root, "metaproxy");
const xmlNode* node = mp::xml::jump_to_children(root, XML_ELEMENT_NODE);
if (name == "route")
m_start_route = value;
+ else if (name == "base")
+ ;// Ignore XInclude base attribute.
else
throw mp::XMLError("Only attribute route allowed"
" in element 'start'. Got " + name);
parse_xml_filters(doc, mp::xml::jump_to_children(node,
XML_ELEMENT_NODE),
test_only, file_include_path);
-
+
node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
// process <routes> node which is expected third element node
mp::xml::check_element_mp(node, "routes");
-
+
parse_xml_routes(doc, mp::xml::jump_to_children(node, XML_ELEMENT_NODE),
test_only, file_include_path);
node = mp::xml::jump_to_next(node, XML_ELEMENT_NODE);
if (node)
{
- throw mp::XMLError("Unexpected element "
+ throw mp::XMLError("Unexpected element "
+ std::string((const char *)node->name));
}
{
check_routes_in_filters(
mp::xml::jump_to_children(n, XML_ELEMENT_NODE));
-
+
}
n = mp::xml::jump_to_next(n, XML_ELEMENT_NODE);
}
}
mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory,
- bool test_only)
+ bool test_only)
: m_p(new Rep)
-{
- LIBXML_TEST_VERSION;
-
+{
xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(),
xmlconf.size());
if (!doc)
}
}
+void mp::RouterFleXML::stop(int signo)
+{
+ std::map<std::string,RouterFleXML::Route>::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<boost::shared_ptr<const mp::filter::Base> >::iterator it;
+
+ for (it = route.m_list.begin(); it != route.m_list.end(); it++)
+ (*it)->stop(signo);
+ route_it++;
+ }
+}
+
+
/*
* Local variables:
* c-basic-offset: 4
projects / metaproxy-moved-to-github.git / blobdiff