From 085935ddd577b0c65b4330318b5ba20492d93126 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Sat, 24 May 2014 13:59:42 +0200 Subject: Implemented ResultNodeFacade as a DOM node construction helper * wraps result node construction and appends it to root node on destruction * offers a simpler interface for common node construction patterns * simplifies result node construction in all external function implementations ** most noticeable in FunctionReadDirectory * expanded FunctionReadDirectory result nodes by name, extension, and full-path nodes --- src/function/read_directory.cc | 40 +++++++++++----------------------------- src/function/read_file.cc | 29 ++++++----------------------- src/function/read_xml_file.cc | 22 +++++----------------- src/function/transform.cc | 18 ++++-------------- 4 files changed, 26 insertions(+), 83 deletions(-) (limited to 'src/function') diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc index 215a59e..a3995ec 100644 --- a/src/function/read_directory.cc +++ b/src/function/read_directory.cc @@ -3,9 +3,9 @@ #include #include #include -#include #include "support/xerces_string_guard.h" +#include "support/dom/result_node_facade.h" namespace InputXSLT { @@ -33,52 +33,34 @@ xercesc::DOMDocument* FunctionReadDirectory::constructDocument( fsContext.iterate( directoryPath, [&domDocument, &rootNode](const boost::filesystem::path& p) { - xercesc::DOMElement* const itemNode( - domDocument->createElement(*XercesStringGuard("result")) - ); + ResultNodeFacade result(domDocument, rootNode, "result"); switch ( boost::filesystem::status(p).type() ) { case boost::filesystem::regular_file: { - itemNode->setAttribute( - *XercesStringGuard("type"), - *XercesStringGuard("file") - ); + result.setAttribute("type", "file"); + result.setValueNode("name", p.stem().string()); + result.setValueNode("extension", p.extension().string()); break; }; case boost::filesystem::directory_file: { - itemNode->setAttribute( - *XercesStringGuard("type"), - *XercesStringGuard("directory") - ); + result.setAttribute("type", "directory"); + result.setValueNode("name", p.filename().string()); break; }; default: { - itemNode->setAttribute( - *XercesStringGuard("type"), - *XercesStringGuard("misc") - ); + result.setAttribute("type", "misc"); + result.setValueNode("name", p.filename().string()); break; }; } - xercesc::DOMText* const textNode( - domDocument->createTextNode( - *XercesStringGuard(p.filename().string()) - ) - ); - - itemNode->appendChild(textNode); - rootNode->appendChild(itemNode); + result.setValueNode("full", boost::filesystem::canonical(p).string()); }); } else { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("error")) - ); - - rootNode->appendChild(resultNode); + ResultNodeFacade result(domDocument, rootNode, "error"); } return domDocument; diff --git a/src/function/read_file.cc b/src/function/read_file.cc index 1a870a6..87423ab 100644 --- a/src/function/read_file.cc +++ b/src/function/read_file.cc @@ -3,11 +3,11 @@ #include #include #include -#include #include "boost/filesystem/fstream.hpp" #include "support/xerces_string_guard.h" +#include "support/dom/result_node_facade.h" namespace { @@ -51,29 +51,12 @@ xercesc::DOMDocument* FunctionReadFile::constructDocument( ); if ( boost::filesystem::is_regular_file(filePath) ) { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("result")) - ); - - resultNode->setAttribute( - *XercesStringGuard("name"), - *XercesStringGuard(filePath.filename().string()) - ); - - xercesc::DOMText* const resultTextNode( - domDocument->createTextNode( - *XercesStringGuard(readFile(filePath)) - ) - ); - - resultNode->appendChild(resultTextNode); - rootNode->appendChild(resultNode); - } else { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("error")) - ); + ResultNodeFacade result(domDocument, rootNode, "result"); - rootNode->appendChild(resultNode); + result.setAttribute("name", filePath.filename().string()); + result.setContent(readFile(filePath)); + } else { + ResultNodeFacade result(domDocument, rootNode, "error"); } return domDocument; diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc index 4eb44e5..6d0fd04 100644 --- a/src/function/read_xml_file.cc +++ b/src/function/read_xml_file.cc @@ -5,12 +5,12 @@ #include #include #include -#include #include #include "boost/filesystem/fstream.hpp" #include "support/xerces_string_guard.h" +#include "support/dom/result_node_facade.h" namespace { @@ -61,27 +61,15 @@ xercesc::DOMDocument* FunctionReadXmlFile::constructDocument( ); if ( boost::filesystem::is_regular_file(filePath) ) { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("result")) - ); + ResultNodeFacade result(domDocument, rootNode, "result"); - resultNode->setAttribute( - *XercesStringGuard("name"), - *XercesStringGuard(filePath.filename().string()) - ); + result.setAttribute("name", filePath.filename().string()); - xercesc::DOMNode* const resultTreeNode( + result.setContent( importDocumentElement(filePath, domDocument) ); - - resultNode->appendChild(resultTreeNode); - rootNode->appendChild(resultNode); } else { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("error")) - ); - - rootNode->appendChild(resultNode); + ResultNodeFacade result(domDocument, rootNode, "error"); } return domDocument; diff --git a/src/function/transform.cc b/src/function/transform.cc index cf6ff09..fd28b34 100644 --- a/src/function/transform.cc +++ b/src/function/transform.cc @@ -6,6 +6,7 @@ #include "transformation_facade.h" #include "support/xerces_string_guard.h" +#include "support/dom/result_node_facade.h" namespace InputXSLT { @@ -43,22 +44,11 @@ xercesc::DOMDocument* FunctionTransform::constructDocument( ); if ( transformation.generate(targetPath, parameterObject) == 0 ) { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("result")) - ); + ResultNodeFacade result(domDocument, rootNode, "result"); - resultNode->setAttribute( - *XercesStringGuard("name"), - *XercesStringGuard(targetPath) - ); - - rootNode->appendChild(resultNode); + result.setAttribute("name", targetPath); } else { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("error")) - ); - - rootNode->appendChild(resultNode); + ResultNodeFacade result(domDocument, rootNode, "error"); } return domDocument; -- cgit v1.2.3