-/* $Id: router_flexml.cpp,v 1.10 2006-01-05 16:39:37 adam Exp $
+/* $Id: router_flexml.cpp,v 1.11 2006-01-09 13:43:59 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
*/
#include "config.hpp"
+#include "xmlutil.hpp"
#include "router_flexml.hpp"
#include "factory_filter.hpp"
#include "factory_static.hpp"
namespace yp2 {
class RouterFleXML::Route {
friend class RouterFleXML::Rep;
+ friend class RouterFleXML::Pos;
+ friend class RouterFleXML;
std::list<boost::shared_ptr<const yp2::filter::Base> > m_list;
};
class RouterFleXML::Rep {
friend class RouterFleXML;
+ friend class RouterFleXML::Pos;
Rep();
+ void base(xmlDocPtr doc, yp2::FactoryFilter &factory);
+
typedef std::map<std::string,
boost::shared_ptr<const yp2::filter::Base > >
IdFilterMap ;
std::map<std::string,RouterFleXML::Route> m_routes;
- void parse_xml_config_dom(xmlDocPtr doc);
+ std::string m_start_route;
- 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);
+#if ROUTE_POS
+#else
+ std::map<std::string,
+ RouterFleXML::Route>::iterator m_cur_route_it;
+
+ 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);
private:
FactoryFilter *m_factory; // TODO shared_ptr
};
+
+#if ROUTE_POS
+ class RouterFleXML::Pos : public RoutePos {
+ public:
+ virtual const filter::Base *move();
+ virtual RoutePos *clone();
+ virtual ~Pos();
+ yp2::RouterFleXML::Rep *m_p;
+
+ std::map<std::string,
+ 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,
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))
+ if (!yp2::xml::is_element_yp2(ptr, name))
throw XMLError("Expected element name " + name);
return true;
}
while(node && check_element_yp2(node, "filter"))
{
filter_nr++;
- std::cout << "processing /yp2/filters/filter["
- << filter_nr << "]" << std::endl;
const struct _xmlAttr *attr;
std::string id_value;
else
throw XMLError("Only attribute id or type allowed"
" in filter element. Got " + name);
-
- std::cout << "attr " << name << "=" << value << "\n";
}
yp2::filter::Base* filter_base = m_factory->create(type_value);
check_element_yp2(node, "route");
unsigned int route_nr = 0;
- while(is_element_yp2(node, "route"))
+ while(yp2::xml::is_element_yp2(node, "route"))
{
route_nr++;
if (name == "id")
id_value = value;
else
- throw XMLError("Only attribute refid allowed route element. Got " + name);
-
- std::cout << "attr " << name << "=" << value << "\n";
+ throw XMLError("Only attribute 'id' allowed for element"
+ "'route'."
+ " Got " + name);
}
Route route;
- std::cout << "processing /yp2/routes/route["
- << route_nr << "]" << std::endl;
-
// process <filter> nodes in third level
-
const xmlNode* node3 = jump_to_children(node, XML_ELEMENT_NODE);
unsigned int filter3_nr = 0;
else if (name == "type")
type_value = value;
else
- throw XMLError("Only attribute refid or type"
- " allowed in filter element. Got " + name);
-
- std::cout << "attr " << name << "=" << value << "\n";
+ throw XMLError("Only attribute 'refid' or 'type'"
+ " allowed for element 'filter'."
+ " Got " + name);
}
if (refid_value.length())
{
route.m_list.push_back(
boost::shared_ptr<yp2::filter::Base>(filter_base));
}
- std::cout << "processing /yp2/routes/route["
- << route_nr << "]/filter["
- << filter3_nr << "]" << std::endl;
-
node3 = jump_to_next(node3, XML_ELEMENT_NODE);
}
check_element_yp2(root, "yp2");
- std::cout << "processing /yp2" << std::endl;
-
// process <start> 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)
- // ;
+ if (check_element_yp2(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);
+ std::string value;
- check_element_yp2(node, "start");
+ if (attr->children && attr->children->type == XML_TEXT_NODE)
+ value = std::string((const char *)attr->children->content);
- std::cout << "processing /yp2/start" << std::endl;
-
+ if (name == "route")
+ m_start_route = value;
+ else
+ throw XMLError("Only attribute start allowed"
+ " in element 'start'. Got " + name);
+ }
+ node = jump_to_next(node, XML_ELEMENT_NODE);
+ }
// process <filters> 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;
parse_xml_filters(doc, jump_to_children(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");
- std::cout << "processing /yp2/routes" << std::endl;
parse_xml_routes(doc, jump_to_children(node, XML_ELEMENT_NODE));
}
{
}
+void yp2::RouterFleXML::Rep::base(xmlDocPtr doc, yp2::FactoryFilter &factory)
+{
+ m_factory = &factory;
+ parse_xml_config_dom(doc);
+ m_start_route = "start";
+}
+
+yp2::RouterFleXML::RouterFleXML(xmlDocPtr doc, yp2::FactoryFilter &factory)
+ : m_p(new Rep)
+{
+ m_p->base(doc, factory);
+}
+
yp2::RouterFleXML::RouterFleXML(std::string xmlconf, yp2::FactoryFilter &factory)
: m_p(new Rep)
{
-
- m_p->m_factory = &factory;
-
LIBXML_TEST_VERSION;
xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(),
throw XMLError("xmlParseMemory failed");
else
{
- m_p->parse_xml_config_dom(doc);
+ m_p->base(doc, factory);
xmlFreeDoc(doc);
}
}
{
}
+#if ROUTE_POS
+const yp2::filter::Base *yp2::RouterFleXML::Pos::move()
+{
+ if (m_filter_it == m_route_it->second.m_list.end())
+ return 0;
+ const yp2::filter::Base *f = (*m_filter_it).get();
+ m_filter_it++;
+ return f;
+}
+
+yp2::RoutePos *yp2::RouterFleXML::createpos() const
+{
+ yp2::RouterFleXML::Pos *p = new yp2::RouterFleXML::Pos;
+
+ p->m_route_it = m_p->m_routes.find(m_p->m_start_route);
+ if (p->m_route_it == m_p->m_routes.end())
+ {
+ delete p;
+ return 0;
+ }
+ p->m_filter_it = p->m_route_it->second.m_list.begin();
+ p->m_p = m_p.get();
+ return p;
+}
+
+yp2::RoutePos *yp2::RouterFleXML::Pos::clone()
+{
+ yp2::RouterFleXML::Pos *p = new yp2::RouterFleXML::Pos;
+ p->m_filter_it = m_filter_it;
+ p->m_route_it = m_route_it;
+ p->m_p = m_p;
+ return p;
+}
+
+yp2::RouterFleXML::Pos::~Pos()
+{
+}
+
+#else
const yp2::filter::Base *
yp2::RouterFleXML::move(const yp2::filter::Base *filter,
const yp2::Package *package) const
{
- return 0;
+ 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