projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.1.2
[metaproxy-moved-to-github.git]
/
src
/
router_flexml.cpp
diff --git
a/src/router_flexml.cpp
b/src/router_flexml.cpp
index
1f5b268
..
759ef06
100644
(file)
--- a/
src/router_flexml.cpp
+++ b/
src/router_flexml.cpp
@@
-1,5
+1,5
@@
/* This file is part of Metaproxy.
/* This file is part of Metaproxy.
- Copyright (C) 2005-2008 Index Data
+ Copyright (C) 2005-2010 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
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,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "config.hpp"
*/
#include "config.hpp"
-#include "xmlutil.hpp"
+#include <metaproxy/xmlutil.hpp>
#include "router_flexml.hpp"
#include "factory_filter.hpp"
#include "factory_static.hpp"
#include "router_flexml.hpp"
#include "factory_filter.hpp"
#include "factory_static.hpp"
@@
-25,6
+25,8
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <iostream>
#include <map>
#include <list>
#include <iostream>
#include <map>
#include <list>
+#include <yaz/log.h>
+#include <yaz/xml_include.h>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
@@
-46,7
+48,8
@@
namespace metaproxy_1 {
friend class RouterFleXML::Pos;
Rep();
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<std::string,
boost::shared_ptr<const mp::filter::Base > >
typedef std::map<std::string,
boost::shared_ptr<const mp::filter::Base > >
@@
-60,7
+63,8
@@
namespace metaproxy_1 {
std::string m_dl_path;
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);
void parse_xml_filters(xmlDocPtr doc, const xmlNode *node,
bool test_only);
@@
-116,8
+120,8
@@
void mp::RouterFleXML::Rep::parse_xml_filters(xmlDocPtr doc,
if (!m_factory->exist(type_value))
{
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);
m_factory->add_creator_dl(type_value, m_dl_path);
}
mp::filter::Base* filter_base = m_factory->create(type_value);
@@
-208,8
+212,8
@@
void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
{
if (!m_factory->exist(type_value))
{
{
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);
m_factory->add_creator_dl(type_value, m_dl_path);
}
mp::filter::Base* filter_base = m_factory->create(type_value);
@@
-234,12
+238,20
@@
void mp::RouterFleXML::Rep::parse_xml_routes(xmlDocPtr doc,
}
void mp::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc,
}
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 (!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");
mp::xml::check_element_mp(root, "metaproxy");
@@
-299,18
+311,18
@@
mp::RouterFleXML::Rep::Rep() : m_xinclude(false)
}
void mp::RouterFleXML::Rep::base(xmlDocPtr doc, mp::FactoryFilter &factory,
}
void mp::RouterFleXML::Rep::base(xmlDocPtr doc, mp::FactoryFilter &factory,
- bool test_only)
+ bool test_only, const char *file_include_path)
{
m_factory = &factory;
{
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,
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(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,
}
mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory,
@@
-325,7
+337,7
@@
mp::RouterFleXML::RouterFleXML(std::string xmlconf, mp::FactoryFilter &factory,
throw mp::XMLError("xmlParseMemory failed");
else
{
throw mp::XMLError("xmlParseMemory failed");
else
{
- m_p->base(doc, factory, test_only);
+ m_p->base(doc, factory, test_only, 0);
xmlFreeDoc(doc);
}
}
xmlFreeDoc(doc);
}
}
@@
-386,8
+398,9
@@
mp::RouterFleXML::Pos::~Pos()
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* indent-tabs-mode: nil
- * c-file-style: "stroustrup"
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+