diff options
author | Adrian Kummerländer | 2014-05-17 13:56:59 +0200 |
---|---|---|
committer | Adrian Kummerländer | 2014-05-17 13:56:59 +0200 |
commit | e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f (patch) | |
tree | 52eb28f50934189b29d4257ccfc45727c628089a /src/function/transform.cc | |
parent | 7bd543e220c806177d805a8f4fbc13e951fe5788 (diff) | |
download | InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.tar InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.tar.gz InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.tar.bz2 InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.tar.lz InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.tar.xz InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.tar.zst InputXSLT-e7f9b4789d5b0971a14ac00c9bc834f7154ccb9f.zip |
Equalized parameter/argument naming pattern accross all external functions
* names matter, from now on parameters to external functions will be called parameters uniformly instead of mixing arguments and parameters
Diffstat (limited to 'src/function/transform.cc')
-rw-r--r-- | src/function/transform.cc | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/function/transform.cc b/src/function/transform.cc index 4f9aecc..6a2b7ad 100644 --- a/src/function/transform.cc +++ b/src/function/transform.cc @@ -11,14 +11,18 @@ namespace InputXSLT { xercesc::DOMDocument* FunctionTransform::constructDocument( const InputXSLT::FilesystemContext& fsContext, - const FunctionBase::argument_tuple& arguments + const FunctionBase::parameter_tuple& parameters ) { - const boost::filesystem::path transformationPath( - fsContext.resolve(std::get<0>(arguments)) + const std::string transformationPath( + fsContext.resolve(std::get<0>(parameters)).string() ); - const boost::filesystem::path targetPath( - fsContext.resolve(std::get<1>(arguments)) + const std::string targetPath( + fsContext.resolve(std::get<1>(parameters)).string() + ); + + const xalan::XObjectPtr& parameterObject( + std::get<2>(parameters) ); xercesc::DOMDocument* const domDocument( @@ -33,23 +37,16 @@ xercesc::DOMDocument* FunctionTransform::constructDocument( domDocument->getDocumentElement() ); - InputXSLT::TransformationFacade transformation( - transformationPath.string() - ); - - const int result = transformation.generate( - targetPath.string(), - std::get<2>(arguments) - ); + InputXSLT::TransformationFacade transformation(transformationPath); - if ( result == 0 ) { + if ( transformation.generate(targetPath, parameterObject) == 0 ) { xercesc::DOMElement* const resultNode( domDocument->createElement(*XercesStringGuard<XMLCh>("result")) ); resultNode->setAttribute( *XercesStringGuard<XMLCh>("name"), - *XercesStringGuard<XMLCh>(targetPath.string()) + *XercesStringGuard<XMLCh>(targetPath) ); rootNode->appendChild(resultNode); |