diff options
author | Adrian Kummerlaender | 2014-06-25 20:23:35 +0200 |
---|---|---|
committer | Adrian Kummerlaender | 2014-06-25 20:23:35 +0200 |
commit | 7b872121000d4db4026d0c90fcb95a10f1e43694 (patch) | |
tree | d1cea19c4556b3574978f51bdf2bed2d36fbb73f /src/support/include_entity_resolver.cc | |
parent | 0d670478b51c55e44f57995fe3ca8a4585723a6c (diff) | |
download | InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.tar InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.tar.gz InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.tar.bz2 InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.tar.lz InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.tar.xz InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.tar.zst InputXSLT-7b872121000d4db4026d0c90fcb95a10f1e43694.zip |
Added support for resolving non-existing paths
* previous logic for resolving boost::filesystem::path parameters in the XObjectValue class actively tried to resolve existing files
** this contradicts the planned introduction of e.g. a external "write-file" function
* callers of external functions with path arguments now have to enclose them in square brackets if include path resolution is required
** analog to the usage of the "xsl:import" tag
* moved "getPathFromSystemId" from compilation local method into static method of IncludeEntityResolver
* changed test cases accordingly
Diffstat (limited to 'src/support/include_entity_resolver.cc')
-rw-r--r-- | src/support/include_entity_resolver.cc | 66 |
1 files changed, 38 insertions, 28 deletions
diff --git a/src/support/include_entity_resolver.cc b/src/support/include_entity_resolver.cc index e1c9f96..07577c1 100644 --- a/src/support/include_entity_resolver.cc +++ b/src/support/include_entity_resolver.cc @@ -4,35 +4,29 @@ #include "boost/filesystem.hpp" +#include "support/xalan_string.h" #include "support/xerces_string_guard.h" namespace { -using InputXSLT::XercesStringGuard; - -inline boost::filesystem::path getPathFromSystemId( - const XMLCh* const systemId) { - return boost::filesystem::path( - *XercesStringGuard<char>(systemId) + 7 - ); -} - -boost::optional<std::string> extractFilePath(const XMLCh* const rawPath) { - const std::string filePath = *XercesStringGuard<char>(rawPath); - const std::size_t leadingDelimiter = filePath.find_first_of('['); - const std::size_t closingDelimiter = filePath.find_last_of(']'); +boost::optional<boost::filesystem::path> extractFilePath( + const std::string& rawPath) { + const std::size_t leadingDelimiter = rawPath.find_first_of('['); + const std::size_t closingDelimiter = rawPath.find_last_of(']'); if ( leadingDelimiter != std::string::npos && closingDelimiter != std::string::npos && leadingDelimiter < closingDelimiter ) { return boost::make_optional( - filePath.substr( - leadingDelimiter + 1, - closingDelimiter - leadingDelimiter - 1 + boost::filesystem::path( + rawPath.substr( + leadingDelimiter + 1, + closingDelimiter - leadingDelimiter - 1 + ) ) ); } else { - return boost::optional<std::string>(); + return boost::optional<boost::filesystem::path>(); } } @@ -40,6 +34,13 @@ boost::optional<std::string> extractFilePath(const XMLCh* const rawPath) { namespace InputXSLT { +boost::filesystem::path IncludeEntityResolver::getPathFromSystemId( + const XMLCh* const systemId) { + return boost::filesystem::path( + *XercesStringGuard<char>(systemId) + 7 + ); +} + IncludeEntityResolver::IncludeEntityResolver( const std::vector<std::string>& path): path_(path.begin(), path.end()) { } @@ -49,36 +50,45 @@ xercesc::InputSource* IncludeEntityResolver::resolveEntity( const XMLCh* const systemId ) { if ( systemId != nullptr ) { - return new xercesc::LocalFileInputSource( - *XercesStringGuard<XMLCh>(this->resolve(systemId).string()) + const std::string systemIdString( + *XercesStringGuard<char>(systemId) ); + + if ( auto resolvedPath = this->resolve(systemIdString) ) { + return new xercesc::LocalFileInputSource( + *XercesStringGuard<XMLCh>((*resolvedPath).string()) + ); + } else { + return new xercesc::LocalFileInputSource( + *XercesStringGuard<XMLCh>(systemIdString) + ); + } } else { return nullptr; } } -boost::filesystem::path IncludeEntityResolver::resolve( - const XMLCh* const rawPath) const { +boost::optional<boost::filesystem::path> IncludeEntityResolver::resolve( + const std::string& rawPath) const { if ( auto filePath = extractFilePath(rawPath) ) { - if ( auto resolvedPath = this->resolve(*filePath) ) { - return *resolvedPath; + if ( auto resolvedPath = this->tryIncludePaths(*filePath) ) { + return boost::make_optional(*resolvedPath); } else { - return *filePath; + return boost::make_optional(*filePath); } } else { - return getPathFromSystemId(rawPath); + return boost::optional<boost::filesystem::path>(); } } -boost::optional<boost::filesystem::path> IncludeEntityResolver::resolve( +boost::optional<boost::filesystem::path> IncludeEntityResolver::tryIncludePaths( const boost::filesystem::path& filePath) const { for ( auto&& context : this->path_ ) { const boost::filesystem::path resolvedPath( context.resolve(filePath) ); - if ( boost::filesystem::exists(resolvedPath) && - boost::filesystem::is_regular_file(resolvedPath) ) { + if ( boost::filesystem::exists(resolvedPath) ) { return boost::make_optional(resolvedPath); } } |