-/* $Id: router_flexml.cpp,v 1.11 2006-01-09 13:43:59 adam Exp $
+/* $Id: router_flexml.cpp,v 1.16 2006-01-19 09:41:01 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
std::string m_start_route;
-#if ROUTE_POS
-#else
- std::map<std::string,
- RouterFleXML::Route>::iterator m_cur_route_it;
+ std::string m_dl_path;
- std::list<boost::shared_ptr <const yp2::filter::Base> >::iterator m_cur_filter_it;
-#endif
void parse_xml_config_dom(xmlDocPtr doc);
- bool check_element_yp2(const xmlNode *ptr,
- const std::string &name);
-
- 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_children(const xmlNode* node, int xml_node_type);
void parse_xml_filters(xmlDocPtr doc, const xmlNode *node);
void parse_xml_routes(xmlDocPtr doc, const xmlNode *node);
FactoryFilter *m_factory; // TODO shared_ptr
};
-#if ROUTE_POS
class RouterFleXML::Pos : public RoutePos {
public:
- virtual const filter::Base *move();
+ virtual const filter::Base *move(const char *route);
virtual RoutePos *clone();
virtual ~Pos();
yp2::RouterFleXML::Rep *m_p;
RouterFleXML::Route>::iterator m_route_it;
std::list<boost::shared_ptr <const yp2::filter::Base> >::iterator m_filter_it;
};
-#endif
-}
-
-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::check_element_yp2(const xmlNode *ptr,
- const std::string &name)
-{
- if (!yp2::xml::is_element_yp2(ptr, name))
- throw XMLError("Expected element name " + name);
- return true;
}
-
void yp2::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
const xmlNode *node)
{
unsigned int filter_nr = 0;
- while(node && check_element_yp2(node, "filter"))
+ while(node && yp2::xml::check_element_yp2(node, "filter"))
{
filter_nr++;
else if (name == "type")
type_value = value;
else
- throw XMLError("Only attribute id or type allowed"
- " in filter element. Got " + name);
+ throw yp2::XMLError("Only attribute id or type allowed"
+ " in filter element. Got " + name);
}
+ if (!m_factory->exist(type_value))
+ {
+ std::cout << "about to load " << type_value << ", path=" <<
+ m_dl_path << "\n";
+ m_factory->add_creator_dl(type_value, m_dl_path);
+ }
yp2::filter::Base* filter_base = m_factory->create(type_value);
filter_base->configure(node);
if (m_id_filter_map.find(id_value) != m_id_filter_map.end())
- throw XMLError("Filter " + id_value + " already defined");
+ throw yp2::XMLError("Filter " + id_value + " already defined");
m_id_filter_map[id_value] =
boost::shared_ptr<yp2::filter::Base>(filter_base);
- node = jump_to_next(node, XML_ELEMENT_NODE);
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
}
void yp2::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
const xmlNode *node)
{
- check_element_yp2(node, "route");
+ yp2::xml::check_element_yp2(node, "route");
unsigned int route_nr = 0;
while(yp2::xml::is_element_yp2(node, "route"))
if (name == "id")
id_value = value;
else
- throw XMLError("Only attribute 'id' allowed for element"
- "'route'."
- " Got " + name);
+ throw yp2::XMLError("Only attribute 'id' allowed for"
+ " element 'route'."
+ " Got " + name);
}
Route route;
// process <filter> nodes in third level
- const xmlNode* node3 = jump_to_children(node, XML_ELEMENT_NODE);
+ const xmlNode* node3 = yp2::xml::jump_to_children(node, XML_ELEMENT_NODE);
unsigned int filter3_nr = 0;
- while(node3 && check_element_yp2(node3, "filter"))
+ while(node3 && yp2::xml::check_element_yp2(node3, "filter"))
{
filter3_nr++;
else if (name == "type")
type_value = value;
else
- throw XMLError("Only attribute 'refid' or 'type'"
- " allowed for element 'filter'."
- " Got " + name);
+ throw yp2::XMLError("Only attribute 'refid' or 'type'"
+ " allowed for element 'filter'."
+ " Got " + name);
}
if (refid_value.length())
{
boost::shared_ptr<const yp2::filter::Base > >::iterator it;
it = m_id_filter_map.find(refid_value);
if (it == m_id_filter_map.end())
- throw XMLError("Unknown filter refid " + refid_value);
+ throw yp2::XMLError("Unknown filter refid "
+ + refid_value);
else
route.m_list.push_back(it->second);
}
else if (type_value.length())
{
+ if (!m_factory->exist(type_value))
+ {
+ std::cout << "about to load " << type_value << ", path=" <<
+ m_dl_path << "\n";
+ m_factory->add_creator_dl(type_value, m_dl_path);
+ }
yp2::filter::Base* filter_base = m_factory->create(type_value);
filter_base->configure(node3);
route.m_list.push_back(
boost::shared_ptr<yp2::filter::Base>(filter_base));
}
- node3 = jump_to_next(node3, XML_ELEMENT_NODE);
+ node3 = yp2::xml::jump_to_next(node3, XML_ELEMENT_NODE);
}
std::map<std::string,RouterFleXML::Route>::iterator it;
it = m_routes.find(id_value);
if (it != m_routes.end())
- throw XMLError("Route id='" + id_value + "' already exist");
+ throw yp2::XMLError("Route id='" + id_value
+ + "' already exist");
else
m_routes[id_value] = route;
- node = jump_to_next(node, XML_ELEMENT_NODE);
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
}
void yp2::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc)
{
if (!doc)
- throw XMLError("Empty XML Document");
+ throw yp2::XMLError("Empty XML Document");
const xmlNode* root = xmlDocGetRootElement(doc);
- check_element_yp2(root, "yp2");
+ yp2::xml::check_element_yp2(root, "yp2");
+ const xmlNode* node = yp2::xml::jump_to_children(root, XML_ELEMENT_NODE);
+
+ if (yp2::xml::is_element_yp2(node, "dlpath"))
+ {
+ m_dl_path = yp2::xml::get_text(node);
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
+ }
// process <start> node which is expected first element node
- const xmlNode* node = jump_to_children(root, XML_ELEMENT_NODE);
- if (check_element_yp2(node, "start"))
+ if (yp2::xml::check_element_yp2(node, "start"))
{
const struct _xmlAttr *attr;
std::string id_value;
if (name == "route")
m_start_route = value;
else
- throw XMLError("Only attribute start allowed"
- " in element 'start'. Got " + name);
+ throw yp2::XMLError("Only attribute start allowed"
+ " in element 'start'. Got " + name);
}
- node = jump_to_next(node, XML_ELEMENT_NODE);
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
- // process <filters> node which is expected second element node
- check_element_yp2(node, "filters");
-
- parse_xml_filters(doc, jump_to_children(node, XML_ELEMENT_NODE));
+ // process <filters> node if given
+ if (yp2::xml::is_element_yp2(node, "filters"))
+ {
+ parse_xml_filters(doc, yp2::xml::jump_to_children(node,
+ XML_ELEMENT_NODE));
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
+ }
// process <routes> node which is expected third element node
- node = jump_to_next(node, XML_ELEMENT_NODE);
- check_element_yp2(node, "routes");
+ yp2::xml::check_element_yp2(node, "routes");
- parse_xml_routes(doc, jump_to_children(node, XML_ELEMENT_NODE));
+ parse_xml_routes(doc, yp2::xml::jump_to_children(node, XML_ELEMENT_NODE));
+
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
+ if (node)
+ {
+ throw yp2::XMLError("Unexpected element "
+ + std::string((const char *)node->name));
+ }
}
yp2::RouterFleXML::Rep::Rep() : m_xinclude(false)
xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(),
xmlconf.size());
if (!doc)
- throw XMLError("xmlParseMemory failed");
+ throw yp2::XMLError("xmlParseMemory failed");
else
{
m_p->base(doc, factory);
{
}
-#if ROUTE_POS
-const yp2::filter::Base *yp2::RouterFleXML::Pos::move()
+const yp2::filter::Base *yp2::RouterFleXML::Pos::move(const char *route)
{
+ if (route && *route)
+ {
+ std::cout << "move to " << route << "\n";
+ m_route_it = m_p->m_routes.find(route);
+ if (m_route_it == m_p->m_routes.end())
+ {
+ std::cout << "no such route " << route << "\n";
+ throw yp2::XMLError("bad route " + std::string(route));
+ }
+ m_filter_it = m_route_it->second.m_list.begin();
+ }
if (m_filter_it == m_route_it->second.m_list.end())
return 0;
const yp2::filter::Base *f = (*m_filter_it).get();
{
}
-#else
-const yp2::filter::Base *
-yp2::RouterFleXML::move(const yp2::filter::Base *filter,
- const yp2::Package *package) const
-{
- if (!filter)
- { // Initial move. find start route
- m_p->m_cur_route_it = m_p->m_routes.find("start");
- if (m_p->m_cur_route_it == m_p->m_routes.end())
- return 0;
- m_p->m_cur_filter_it = m_p->m_cur_route_it->second.m_list.begin();
- }
- else
- {
- const yp2::filter::Base *f = (*m_p->m_cur_filter_it).get();
- if (f != filter)
- (m_p->m_cur_filter_it)++;
- else
- {
- // TOTO: should search all routes (not only start)!
- m_p->m_cur_filter_it = m_p->m_cur_route_it->second.m_list.begin();
- while (m_p->m_cur_filter_it !=
- m_p->m_cur_route_it->second.m_list.end())
- {
- const yp2::filter::Base *f = (*m_p->m_cur_filter_it).get();
- (m_p->m_cur_filter_it)++;
- if (filter == f)
- break;
- }
- }
- }
- if (m_p->m_cur_filter_it == m_p->m_cur_route_it->second.m_list.end())
- return 0;
- return (*m_p->m_cur_filter_it).get();
-}
-#endif
/*
* Local variables:
projects / metaproxy-moved-to-github.git / blobdiff