From 334efe3383c436d61a8e5dd95b923cb0d5db9652 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Sat, 19 Apr 2014 15:01:33 +0200 Subject: Further code style fixes * .. in the face of the planned development of usable external functions using the current proof-of-concept coding * replaced usage of std::shared_ptr in FunctionReadXmlFile class with explicit implementation of default and copy constructor * separated implementation and interfaces --- src/function/read_file.cc | 49 +++++++++++++++++++++++++++++++++++++++++++ src/function/read_file.h | 36 +++++++++++++++++++++++++++++++ src/function/read_xml_file.cc | 44 ++++++++++++++++++++++++++++++++++++++ src/function/read_xml_file.h | 42 +++++++++++++++++++++++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 src/function/read_file.cc create mode 100644 src/function/read_file.h create mode 100644 src/function/read_xml_file.cc create mode 100644 src/function/read_xml_file.h (limited to 'src/function') diff --git a/src/function/read_file.cc b/src/function/read_file.cc new file mode 100644 index 0000000..efc1f61 --- /dev/null +++ b/src/function/read_file.cc @@ -0,0 +1,49 @@ +#include "read_file.h" + +namespace InputXSLT { + +xalan::XObjectPtr FunctionReadFile::execute( + xalan::XPathExecutionContext& executionContext, + xalan::XalanNode* context, + const xalan::Function::XObjectArgVectorType& arguments, + const xalan::Locator* locator +) const { + if ( arguments.size() != 1 ) { + xalan::XPathExecutionContext::GetAndReleaseCachedString guard( + executionContext + ); + + generalError(executionContext, context, locator); + } + + xalan::CharVectorType fileNameVector; + std::string fileNameString; + + arguments[0]->str().transcode(fileNameVector); + + std::move( + fileNameVector.begin(), + fileNameVector.end(), + fileNameString.begin() + ); + + return executionContext.getXObjectFactory().createString( + xalan::XalanDOMString( + InputXSLT::readFile(fileNameString).data() + ) + ); +} + +FunctionReadFile* FunctionReadFile::clone( + xalan::MemoryManager& manager) const { + return xalan::XalanCopyConstruct(manager, *this); +} + +const xalan::XalanDOMString& FunctionReadFile::getError( + xalan::XalanDOMString& result) const { + result.assign("The read-file() function expects one argument."); + + return result; +} + +} diff --git a/src/function/read_file.h b/src/function/read_file.h new file mode 100644 index 0000000..dbcf3d6 --- /dev/null +++ b/src/function/read_file.h @@ -0,0 +1,36 @@ +#ifndef INPUTXSLT_SRC_FUNCTION_READ_FILE_H_ +#define INPUTXSLT_SRC_FUNCTION_READ_FILE_H_ + +#include +#include +#include +#include +#include +#include + +#include "utility.h" + +namespace InputXSLT { + +class FunctionReadFile : public xalan::Function { + public: + virtual xalan::XObjectPtr execute( + xalan::XPathExecutionContext&, + xalan::XalanNode*, + const xalan::Function::XObjectArgVectorType&, + const xalan::Locator* + ) const; + + virtual FunctionReadFile* clone(xalan::MemoryManager&) const; + + FunctionReadFile& operator=(const FunctionReadFile&) = delete; + bool operator==(const FunctionReadFile&) const = delete; + + private: + const xalan::XalanDOMString& getError(xalan::XalanDOMString&) const; + +}; + +} + +#endif // INPUTXSLT_SRC_FUNCTION_READ_FILE_H_ diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc new file mode 100644 index 0000000..616d189 --- /dev/null +++ b/src/function/read_xml_file.cc @@ -0,0 +1,44 @@ +#include "read_xml_file.h" + +namespace InputXSLT { + +FunctionReadXmlFile::FunctionReadXmlFile(): + parser_() { } + +FunctionReadXmlFile::FunctionReadXmlFile(const FunctionReadXmlFile&): + parser_() { } + +xalan::XObjectPtr FunctionReadXmlFile::execute( + xalan::XPathExecutionContext& executionContext, + xalan::XalanNode* context, + const xalan::Function::XObjectArgVectorType& arguments, + const xalan::Locator* locator +) const { + if ( arguments.size() != 1 ) { + xalan::XPathExecutionContext::GetAndReleaseCachedString guard( + executionContext + ); + + generalError(executionContext, context, locator); + } + + return executionContext.getXObjectFactory().createNodeSet( + this->parser_.parseXMLStream( + xalan::XSLTInputSource(arguments[0]->str()) + ) + ); +} + +FunctionReadXmlFile* FunctionReadXmlFile::clone( + xalan::MemoryManager& manager) const { + return xalan::XalanCopyConstruct(manager, *this); +} + +const xalan::XalanDOMString& FunctionReadXmlFile::getError( + xalan::XalanDOMString& result) const { + result.assign("The read-xml-file() function expects one argument."); + + return result; +} + +} diff --git a/src/function/read_xml_file.h b/src/function/read_xml_file.h new file mode 100644 index 0000000..1556764 --- /dev/null +++ b/src/function/read_xml_file.h @@ -0,0 +1,42 @@ +#ifndef INPUTXSLT_SRC_FUNCTION_READ_XML_FILE_H_ +#define INPUTXSLT_SRC_FUNCTION_READ_XML_FILE_H_ + +#include +#include +#include +#include +#include +#include +#include + +#include "utility.h" + +namespace InputXSLT { + +class FunctionReadXmlFile : public xalan::Function { + public: + FunctionReadXmlFile(); + FunctionReadXmlFile(const FunctionReadXmlFile&); + + virtual xalan::XObjectPtr execute( + xalan::XPathExecutionContext& executionContext, + xalan::XalanNode* context, + const xalan::Function::XObjectArgVectorType& arguments, + const xalan::Locator* locator + ) const; + + virtual FunctionReadXmlFile* clone(xalan::MemoryManager&) const; + + FunctionReadXmlFile& operator=(const FunctionReadXmlFile&) = delete; + bool operator==(const FunctionReadXmlFile&) const = delete; + + private: + mutable xalan::XercesParserLiaison parser_; + + const xalan::XalanDOMString& getError(xalan::XalanDOMString& result) const; + +}; + +} + +#endif // INPUTXSLT_SRC_FUNCTION_READ_XML_FILE_H_ -- cgit v1.2.3