diff options
author | Adrian Kummerländer | 2014-06-11 18:33:15 +0200 |
---|---|---|
committer | Adrian Kummerländer | 2014-06-11 18:33:15 +0200 |
commit | 2b484dc0d93e7577ceb153fb8c6114aaaa03d79a (patch) | |
tree | e98dd086ee8c2c58722860b127ef059a7d557f6c /src/support | |
parent | e805000b1841691cd58930e80bd896a4f7611fd0 (diff) | |
download | InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.tar InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.tar.gz InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.tar.bz2 InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.tar.lz InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.tar.xz InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.tar.zst InputXSLT-2b484dc0d93e7577ceb153fb8c6114aaaa03d79a.zip |
Fixed include entity resolution logic
* if a square bracket enclosed path can be extracted but not resolved against the include path vector we should return at least the extracted path and not the raw path
* otherwise the system has no chance of correctly resolving things
** additionally error messages were showing the square bracket syntax instead of the actual path
Diffstat (limited to 'src/support')
-rw-r--r-- | src/support/include_entity_resolver.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/support/include_entity_resolver.cc b/src/support/include_entity_resolver.cc index 5e106f2..86535c8 100644 --- a/src/support/include_entity_resolver.cc +++ b/src/support/include_entity_resolver.cc @@ -63,7 +63,7 @@ boost::filesystem::path IncludeEntityResolver::resolve( if ( auto resolvedPath = this->resolve(*filePath) ) { return *resolvedPath; } else { - return getPathFromSystemId(rawPath); + return *filePath; } } else { return getPathFromSystemId(rawPath); |