From 52b60c1a8c23f11ab18fad06e0957490c7436e0a Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Wed, 28 May 2014 22:09:50 +0200 Subject: Moved input trimming into XObjectValue namespace * std::string specialization of "get" template method * replaces FunctionTransform local input trimming implemented in 5859cb6 --- src/function/transform.cc | 10 ++++------ src/support/tuple/xobject_value.cc | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/function/transform.cc b/src/function/transform.cc index 06e4c19..fd28b34 100644 --- a/src/function/transform.cc +++ b/src/function/transform.cc @@ -4,8 +4,6 @@ #include #include -#include - #include "transformation_facade.h" #include "support/xerces_string_guard.h" #include "support/dom/result_node_facade.h" @@ -16,13 +14,13 @@ xercesc::DOMDocument* FunctionTransform::constructDocument( const InputXSLT::FilesystemContext& fsContext, const FunctionBase::parameter_tuple& parameters ) { - const std::string transformationPath(boost::trim_copy( + const std::string transformationPath( fsContext.resolve(std::get<0>(parameters)).string() - )); + ); - const std::string targetPath(boost::trim_copy( + const std::string targetPath( fsContext.resolve(std::get<1>(parameters)).string() - )); + ); const xalan::XObjectPtr& parameterObject( std::get<2>(parameters) diff --git a/src/support/tuple/xobject_value.cc b/src/support/tuple/xobject_value.cc index fac4d96..cdeb9c6 100644 --- a/src/support/tuple/xobject_value.cc +++ b/src/support/tuple/xobject_value.cc @@ -1,5 +1,7 @@ #include "xobject_value.h" +#include + #include #include "support/xalan_string.h" @@ -10,7 +12,7 @@ namespace XObjectValue { template <> std::string get(const xalan::XObjectPtr& ptr) { - return toString(ptr->str()); + return boost::trim_copy(toString(ptr->str())); } template <> -- cgit v1.2.3