From bd24e3fe6335bc776400be6bcb44a0701ecc4133 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Sun, 4 May 2014 20:49:37 +0200 Subject: Moved DOM document construction logic into local functions * this change makes the underlying similarity between all currently implemented external functions obvious * they more or less only differ in their document construction logic ** i.e. there is a possibility for a second layer of abstraction between the classes derived from xalan::Function and the actual functionality * added boost::filesystem::path taking overload of the _iterate_ member method to FilesystemGuard ** this overload functions as the _master_ overload that is called by all other overloads which merely perform type conversion and path resolution ** this overload doesn't perform path resolution --- src/function/read_directory.cc | 147 +++++++++++++++++++++----------------- src/function/read_file.cc | 90 ++++++++++++----------- src/function/read_xml_file.cc | 86 ++++++++++++---------- src/support/filesystem_context.cc | 11 ++- src/support/filesystem_context.h | 2 + 5 files changed, 186 insertions(+), 150 deletions(-) (limited to 'src') diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc index 09f8221..48ffa51 100644 --- a/src/function/read_directory.cc +++ b/src/function/read_directory.cc @@ -8,6 +8,83 @@ #include "support/xerces_string_guard.h" #include "support/filesystem_context.h" +namespace { + +using InputXSLT::XercesStringGuard; + +xercesc::DOMDocument* constructDocument( + const InputXSLT::FilesystemContext& fsContext, + const boost::filesystem::path& directoryPath +) { + xercesc::DOMDocument* const domDocument( + xercesc::DOMImplementation::getImplementation()->createDocument( + nullptr, + *XercesStringGuard("content"), + nullptr + ) + ); + + xercesc::DOMNode* const rootNode( + domDocument->getDocumentElement() + ); + + if ( boost::filesystem::is_directory(directoryPath) ) { + fsContext.iterate( + directoryPath, + [&domDocument, &rootNode](const boost::filesystem::path& p) { + xercesc::DOMElement* const itemNode( + domDocument->createElement(*XercesStringGuard("result")) + ); + + switch ( boost::filesystem::status(p).type() ) { + case boost::filesystem::regular_file: { + itemNode->setAttribute( + *XercesStringGuard("type"), + *XercesStringGuard("file") + ); + + break; + }; + case boost::filesystem::directory_file: { + itemNode->setAttribute( + *XercesStringGuard("type"), + *XercesStringGuard("directory") + ); + + break; + }; + default: { + itemNode->setAttribute( + *XercesStringGuard("type"), + *XercesStringGuard("misc") + ); + + break; + }; + } + + xercesc::DOMText* const textNode( + domDocument->createTextNode( + *XercesStringGuard(p.filename().string()) + ) + ); + + itemNode->appendChild(textNode); + rootNode->appendChild(itemNode); + }); + } else { + xercesc::DOMElement* const resultNode( + domDocument->createElement(*XercesStringGuard("error")) + ); + + rootNode->appendChild(resultNode); + } + + return domDocument; +} + +} + namespace InputXSLT { FunctionReadDirectory::FunctionReadDirectory(): @@ -19,10 +96,10 @@ xalan::XObjectPtr FunctionReadDirectory::execute( const xalan::XObjectPtr argument, const xalan::Locator* locator ) const { - const FilesystemContext fs_context(locator); + const FilesystemContext fsContext(locator); const boost::filesystem::path directoryPath( - fs_context.resolve(argument->str()) + fsContext.resolve(argument->str()) ); DomDocumentCache::optional_item optionalCachedDocument( @@ -30,73 +107,9 @@ xalan::XObjectPtr FunctionReadDirectory::execute( ); if ( !optionalCachedDocument.first ) { - xercesc::DOMDocument* const domDocument( - xercesc::DOMImplementation::getImplementation()->createDocument( - nullptr, - *XercesStringGuard("content"), - nullptr - ) - ); - - xercesc::DOMNode* const rootNode( - domDocument->getDocumentElement() - ); - - if ( boost::filesystem::is_directory(directoryPath) ) { - fs_context.iterate( - argument->str(), - [&domDocument, &rootNode](const boost::filesystem::path& p) { - xercesc::DOMElement* const itemNode( - domDocument->createElement(*XercesStringGuard("result")) - ); - - switch ( boost::filesystem::status(p).type() ) { - case boost::filesystem::regular_file: { - itemNode->setAttribute( - *XercesStringGuard("type"), - *XercesStringGuard("file") - ); - - break; - }; - case boost::filesystem::directory_file: { - itemNode->setAttribute( - *XercesStringGuard("type"), - *XercesStringGuard("directory") - ); - - break; - }; - default: { - itemNode->setAttribute( - *XercesStringGuard("type"), - *XercesStringGuard("misc") - ); - - break; - }; - } - - xercesc::DOMText* const textNode( - domDocument->createTextNode( - *XercesStringGuard(p.filename().string()) - ) - ); - - itemNode->appendChild(textNode); - rootNode->appendChild(itemNode); - }); - } else { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("error")) - ); - - rootNode->appendChild(resultNode); - } - optionalCachedDocument = this->document_cache_->create( directoryPath.string(), - domDocument + constructDocument(fsContext, directoryPath) ); } diff --git a/src/function/read_file.cc b/src/function/read_file.cc index 8fcc04b..ba94909 100644 --- a/src/function/read_file.cc +++ b/src/function/read_file.cc @@ -12,6 +12,8 @@ namespace { +using InputXSLT::XercesStringGuard; + inline std::string readFile(const boost::filesystem::path& filePath) { boost::filesystem::ifstream file(filePath); @@ -21,6 +23,50 @@ inline std::string readFile(const boost::filesystem::path& filePath) { ); } +xercesc::DOMDocument* constructDocument( + const boost::filesystem::path& filePath +) { + xercesc::DOMDocument* const domDocument( + xercesc::DOMImplementation::getImplementation()->createDocument( + nullptr, + *XercesStringGuard("content"), + nullptr + ) + ); + + xercesc::DOMNode* const rootNode( + domDocument->getDocumentElement() + ); + + 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")) + ); + + rootNode->appendChild(resultNode); + } + + return domDocument; +} + } namespace InputXSLT { @@ -34,10 +80,10 @@ xalan::XObjectPtr FunctionReadFile::execute( const xalan::XObjectPtr argument, const xalan::Locator* locator ) const { - const FilesystemContext fs_context(locator); + const FilesystemContext fsContext(locator); const boost::filesystem::path filePath( - fs_context.resolve(argument->str()) + fsContext.resolve(argument->str()) ); DomDocumentCache::optional_item optionalCachedDocument( @@ -45,47 +91,9 @@ xalan::XObjectPtr FunctionReadFile::execute( ); if ( !optionalCachedDocument.first ) { - xercesc::DOMDocument* const domDocument( - xercesc::DOMImplementation::getImplementation()->createDocument( - nullptr, - *XercesStringGuard("content"), - nullptr - ) - ); - - xercesc::DOMNode* const rootNode( - domDocument->getDocumentElement() - ); - - 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")) - ); - - rootNode->appendChild(resultNode); - } - optionalCachedDocument = this->document_cache_->create( filePath.string(), - domDocument + constructDocument(filePath) ); } diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc index 0fa21fe..a4e3e3c 100644 --- a/src/function/read_xml_file.cc +++ b/src/function/read_xml_file.cc @@ -13,6 +13,8 @@ namespace { +using InputXSLT::XercesStringGuard; + inline xercesc::DOMNode* importDocumentElement( const boost::filesystem::path& filePath, xercesc::DOMDocument* const domDocument @@ -27,6 +29,48 @@ inline xercesc::DOMNode* importDocumentElement( ); } +xercesc::DOMDocument* constructDocument( + const boost::filesystem::path& filePath +) { + xercesc::DOMDocument* const domDocument( + xercesc::DOMImplementation::getImplementation()->createDocument( + nullptr, + *XercesStringGuard("content"), + nullptr + ) + ); + + xercesc::DOMNode* const rootNode( + domDocument->getDocumentElement() + ); + + if ( boost::filesystem::is_regular_file(filePath) ) { + xercesc::DOMElement* const resultNode( + domDocument->createElement(*XercesStringGuard("result")) + ); + + resultNode->setAttribute( + *XercesStringGuard("name"), + *XercesStringGuard(filePath.filename().string()) + ); + + xercesc::DOMNode* const resultTreeNode( + importDocumentElement(filePath, domDocument) + ); + + resultNode->appendChild(resultTreeNode); + rootNode->appendChild(resultNode); + } else { + xercesc::DOMElement* const resultNode( + domDocument->createElement(*XercesStringGuard("error")) + ); + + rootNode->appendChild(resultNode); + } + + return domDocument; +} + } namespace InputXSLT { @@ -40,10 +84,10 @@ xalan::XObjectPtr FunctionReadXmlFile::execute( const xalan::XObjectPtr argument, const xalan::Locator* locator ) const { - const FilesystemContext fs_context(locator); + const FilesystemContext fsContext(locator); const boost::filesystem::path filePath( - fs_context.resolve(argument->str()) + fsContext.resolve(argument->str()) ); DomDocumentCache::optional_item optionalCachedDocument( @@ -51,45 +95,9 @@ xalan::XObjectPtr FunctionReadXmlFile::execute( ); if ( !optionalCachedDocument.first ) { - xercesc::DOMDocument* const domDocument( - xercesc::DOMImplementation::getImplementation()->createDocument( - nullptr, - *XercesStringGuard("content"), - nullptr - ) - ); - - xercesc::DOMNode* const rootNode( - domDocument->getDocumentElement() - ); - - if ( boost::filesystem::is_regular_file(filePath) ) { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("result")) - ); - - resultNode->setAttribute( - *XercesStringGuard("name"), - *XercesStringGuard(filePath.filename().string()) - ); - - xercesc::DOMNode* const resultTreeNode( - importDocumentElement(filePath, domDocument) - ); - - resultNode->appendChild(resultTreeNode); - rootNode->appendChild(resultNode); - } else { - xercesc::DOMElement* const resultNode( - domDocument->createElement(*XercesStringGuard("error")) - ); - - rootNode->appendChild(resultNode); - } - optionalCachedDocument = this->document_cache_->create( filePath.string(), - domDocument + constructDocument(filePath) ); } diff --git a/src/support/filesystem_context.cc b/src/support/filesystem_context.cc index 32646be..418d159 100644 --- a/src/support/filesystem_context.cc +++ b/src/support/filesystem_context.cc @@ -36,11 +36,9 @@ boost::filesystem::path FilesystemContext::resolve( } void FilesystemContext::iterate( - const std::string& path, + const boost::filesystem::path& directory, std::function func ) const { - const boost::filesystem::path directory(this->resolve(path)); - if ( boost::filesystem::is_directory(directory) ) { for ( boost::filesystem::directory_iterator iter(directory); iter != boost::filesystem::directory_iterator(); @@ -53,6 +51,13 @@ void FilesystemContext::iterate( } } +void FilesystemContext::iterate( + const std::string& path, + std::function func +) const { + this->iterate(this->resolve(path), func); +} + void FilesystemContext::iterate( const xalan::XalanDOMString& path, std::function func diff --git a/src/support/filesystem_context.h b/src/support/filesystem_context.h index f743c89..05d5862 100644 --- a/src/support/filesystem_context.h +++ b/src/support/filesystem_context.h @@ -20,6 +20,8 @@ class FilesystemContext { boost::filesystem::path resolve(const std::string&) const; boost::filesystem::path resolve(const xalan::XalanDOMString&) const; + void iterate(const boost::filesystem::path&, + std::function) const; void iterate(const std::string&, std::function) const; void iterate(const xalan::XalanDOMString&, -- cgit v1.2.3