#include "logging.h"
#include "util/CurlURLInputStream.h"
#include "util/NDC.h"
+#include "util/PathResolver.h"
#include "util/ParserPool.h"
#include "util/Threads.h"
#include "util/XMLHelper.h"
ParserPool::ParserPool(bool namespaceAware, bool schemaAware)
- : m_namespaceAware(namespaceAware), m_schemaAware(schemaAware), m_lock(Mutex::create()), m_security(new SecurityManager()) {}
+ : m_namespaceAware(namespaceAware), m_schemaAware(schemaAware), m_lock(Mutex::create()), m_security(new SecurityManager()) {
+
+ int expLimit = 0;
+ const char* env = getenv("XMLTOOLING_ENTITY_EXPANSION_LIMIT");
+ if (env) {
+ expLimit = atoi(env);
+ }
+ if (expLimit <= 0)
+ expLimit = XMLTOOLING_ENTITY_EXPANSION_LIMIT;
+ m_security->setEntityExpansionLimit(expLimit);
+}
ParserPool::~ParserPool()
{
return false;
}
- Lock lock(m_lock.get());
- m_schemaLocMap[nsURI]=pathname;
+ // Roundtrip to local code page and back to translate path as needed.
+ string topath(p.get());
+ XMLToolingConfig::getConfig().getPathResolver()->resolve(topath, PathResolver::XMLTOOLING_XML_FILE);
+ auto_ptr_XMLCh temp(topath.c_str());
+
+ Lock lock(m_lock);
+ m_schemaLocMap[nsURI] = temp.get();
m_schemaLocations.erase();
for_each(m_schemaLocMap.begin(), m_schemaLocMap.end(), doubleit<xstring>(m_schemaLocations,chSpace));
return true;
}
+bool ParserPool::loadCatalogs(const char* pathnames)
+{
+ string temp(pathnames);
+ trim(temp);
+ vector<string> catpaths;
+ split(catpaths, temp, is_any_of(PATH_SEPARATOR_STR), algorithm::token_compress_on);
+ static bool (ParserPool::* lc)(const char*) = &ParserPool::loadCatalog;
+ for_each(catpaths.begin(), catpaths.end(), boost::bind(lc, this, boost::bind(&string::c_str, _1)));
+ return !catpaths.empty();
+}
+
bool ParserPool::loadCatalog(const char* pathname)
{
- auto_ptr_XMLCh temp(pathname);
+ string p(pathname);
+ XMLToolingConfig::getConfig().getPathResolver()->resolve(p, PathResolver::XMLTOOLING_XML_FILE);
+ auto_ptr_XMLCh temp(p.c_str());
return loadCatalog(temp.get());
}
}
// Fetch all the <system> elements.
- DOMNodeList* mappings=root->getElementsByTagNameNS(CATALOG_NS,system);
- Lock lock(m_lock.get());
- for (XMLSize_t i=0; i<mappings->getLength(); i++) {
- root=static_cast<DOMElement*>(mappings->item(i));
- const XMLCh* from=root->getAttributeNS(nullptr,systemId);
- const XMLCh* to=root->getAttributeNS(nullptr,uri);
- m_schemaLocMap[from]=to;
+ DOMNodeList* mappings = root->getElementsByTagNameNS(CATALOG_NS,system);
+ Lock lock(m_lock);
+ for (XMLSize_t i = 0; i < mappings->getLength(); i++) {
+ root = static_cast<DOMElement*>(mappings->item(i));
+ const XMLCh* from = root->getAttributeNS(nullptr,systemId);
+ const XMLCh* to = root->getAttributeNS(nullptr,uri);
+
+ // Roundtrip to local code page and back to translate path as needed.
+ auto_ptr_char temp(to);
+ string topath(temp.get());
+ XMLToolingConfig::getConfig().getPathResolver()->resolve(topath, PathResolver::XMLTOOLING_XML_FILE);
+ auto_ptr_XMLCh temp2(topath.c_str());
+
+ m_schemaLocMap[from] = temp2.get();
}
m_schemaLocations.erase();
for_each(m_schemaLocMap.begin(), m_schemaLocMap.end(), doubleit<xstring>(m_schemaLocations,chSpace));
#endif
if (!systemId)
return nullptr;
+ xstring sysId(systemId);
Category& log=Category::getInstance(XMLTOOLING_LOGCAT".ParserPool");
if (log.isDebugEnabled()) {
}
// Find well-known schemas in the specified location.
- map<xstring,xstring>::const_iterator i = m_schemaLocMap.find(systemId);
+ map<xstring,xstring>::const_iterator i = m_schemaLocMap.find(sysId);
if (i != m_schemaLocMap.end())
return new Wrapper4InputSource(new LocalFileInputSource(baseURI, i->second.c_str()));
// Check for entity as a suffix of a value in the map.
+ bool (*p_ends_with)(const xstring&, const xstring&) = ends_with;
i = find_if(
m_schemaLocMap.begin(), m_schemaLocMap.end(),
- boost::bind(ends_with<const xstring&,const xstring&>, boost::bind(&map<xstring,xstring>::value_type::second, _1), systemId)
+ boost::bind(p_ends_with, boost::bind(&map<xstring,xstring>::value_type::second, _1), boost::ref(sysId))
);
if (i != m_schemaLocMap.end())
return new Wrapper4InputSource(new LocalFileInputSource(baseURI, i->second.c_str()));
DOMLSParser* ParserPool::checkoutBuilder()
{
- Lock lock(m_lock.get());
+ Lock lock(m_lock);
if (m_pool.empty()) {
DOMLSParser* builder=createBuilder();
return builder;
void ParserPool::checkinBuilder(DOMLSParser* builder)
{
if (builder) {
- Lock lock(m_lock.get());
+ Lock lock(m_lock);
m_pool.push(builder);
}
}
DOMBuilder* ParserPool::checkoutBuilder()
{
- Lock lock(m_lock.get());
+ Lock lock(m_lock);
if (m_pool.empty()) {
DOMBuilder* builder=createBuilder();
return builder;
void ParserPool::checkinBuilder(DOMBuilder* builder)
{
if (builder) {
- Lock lock(m_lock.get());
+ Lock lock(m_lock);
m_pool.push(builder);
}
}