-/* $Id: router_flexml.cpp,v 1.22 2007-05-09 21:23:09 adam Exp $
- Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+ 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
for more details.
You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
#include "config.hpp"
-#include "xmlutil.hpp"
+#include <metaproxy/xmlutil.hpp>
#include "router_flexml.hpp"
#include "factory_filter.hpp"
#include "factory_static.hpp"
#include <iostream>
#include <map>
#include <list>
+#include <yaz/log.h>
+#include <yaz/xml_include.h>
#include <boost/shared_ptr.hpp>
friend class RouterFleXML::Pos;
Rep();
- void base(xmlDocPtr doc, mp::FactoryFilter &factory);
+ void base(xmlDocPtr doc, mp::FactoryFilter &factory, bool test_only,
+ const char *file_include_path);
typedef std::map<std::string,
boost::shared_ptr<const mp::filter::Base > >
std::string m_dl_path;
- void parse_xml_config_dom(xmlDocPtr doc);
+ void parse_xml_config_dom(xmlDocPtr doc, bool test_only,
+ const char *file_include_path);
- void parse_xml_filters(xmlDocPtr doc, const xmlNode *node);
- void parse_xml_routes(xmlDocPtr doc, const xmlNode *node);
+ void parse_xml_filters(xmlDocPtr doc, const xmlNode *node,
+ bool test_only, const char *file_include_path);
+ void parse_xml_routes(xmlDocPtr doc, const xmlNode *node,
+ bool test_only, const char *file_include_path);
bool m_xinclude;
private:
}
void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
- const xmlNode *node)
+ const xmlNode *node,
+ bool test_only,
+ const char *file_include_path)
{
unsigned int filter_nr = 0;
while(node && mp::xml::check_element_mp(node, "filter"))
if (!m_factory->exist(type_value))
{
- std::cout << "about to load " << type_value << ", path=" <<
- m_dl_path << "\n";
+ yaz_log(YLOG_LOG, "Loading %s (dlpath %s)",
+ 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);
- filter_base->configure(node);
+ 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");
}
void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
- const xmlNode *node)
+ const xmlNode *node,
+ bool test_only,
+ const char *file_include_path)
{
mp::xml::check_element_mp(node, "route");
{
if (!m_factory->exist(type_value))
{
- std::cout << "about to load " << type_value << ", path=" <<
- m_dl_path << "\n";
+ yaz_log(YLOG_LOG, "Loading %s (dlpath %s)",
+ 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);
- filter_base->configure(node3);
+ filter_base->configure(node3, test_only, file_include_path);
route.m_list.push_back(
boost::shared_ptr<mp::filter::Base>(filter_base));
}
}
-void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc)
+void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc,
+ 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");
if (mp::xml::is_element_mp(node, "filters"))
{
parse_xml_filters(doc, mp::xml::jump_to_children(node,
- XML_ELEMENT_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));
+ 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)
{
}
-void mp::RouterFleXML::Rep::base(xmlDocPtr doc, mp::FactoryFilter &factory)
+void mp::RouterFleXML::Rep::base(xmlDocPtr doc, mp::FactoryFilter &factory,
+ bool test_only, const char *file_include_path)
{
m_factory = &factory;
- parse_xml_config_dom(doc);
+ parse_xml_config_dom(doc, test_only, file_include_path);
m_start_route = "start";
}
-mp::RouterFleXML::RouterFleXML(xmlDocPtr doc, mp::FactoryFilter &factory)
+mp::RouterFleXML::RouterFleXML(xmlDocPtr doc, mp::FactoryFilter &factory,
+ bool test_only, const char *file_include_path)
: m_p(new Rep)
{
- m_p->base(doc, factory);
+ m_p->base(doc, factory, test_only, file_include_path);
}
-mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory)
+mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory,
+ bool test_only)
: m_p(new Rep)
{
LIBXML_TEST_VERSION;
throw mp::XMLError("xmlParseMemory failed");
else
{
- m_p->base(doc, factory);
+ m_p->base(doc, factory, test_only, 0);
xmlFreeDoc(doc);
}
}
}
+void mp::RouterFleXML::start()
+{
+ 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)->start();
+ route_it++;
+ }
+}
+
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / metaproxy-moved-to-github.git / blobdiff