From 6dd832dd0adb35f63148a0e7bd5bdcfb28516c3b Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Fri, 18 Apr 2014 19:51:24 +0200 Subject: Implemented basic XML reading capabilities * command "read-xml-file" reads a XML file and allows it to be transformed by the calling XSLT * this will allow workflows like the following: ** a tranformation reads all the markdown files in a directory ** these markdown files are converted to a xml representation by a external function calling a appropriate C++ markdown parser ** the XML representation of each markdown file is converted to XHTML inside the XSL transformation ** ... and embedded into the output XHTML document ** => all inside a single XSL tranformation *** i.e. it is provided with only a empty dummy XML input file and fetches the actual input by itself * as all current code contained within this repository this is just a quick and dirty proof-of-concept and not in any way good code --- CMakeLists.txt | 2 +- dummy/in.xml | 7 +----- dummy/test.txt | 8 ++++++- dummy/transform.xsl | 15 ++++++------ src/read_file_command.h | 8 +++---- src/read_xml_file_command.h | 57 +++++++++++++++++++++++++++++++++++++++++++++ src/utility.h | 5 ++++ test.cc | 9 ++++++- 8 files changed, 91 insertions(+), 20 deletions(-) create mode 100644 src/read_xml_file_command.h diff --git a/CMakeLists.txt b/CMakeLists.txt index e98ef8a..7aadb81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(InputXSLT) set( CMAKE_CXX_FLAGS - "-std=c++11 -W -Wall -Wextra -Winline -pedantic" + "-std=c++11 -W -Wall -Wextra -Winline -pedantic -g" ) include_directories( diff --git a/dummy/in.xml b/dummy/in.xml index 7b512bc..6abcacd 100644 --- a/dummy/in.xml +++ b/dummy/in.xml @@ -1,7 +1,2 @@ - - Test1 - Test2 - Test3 - Test4 - + diff --git a/dummy/test.txt b/dummy/test.txt index cd08755..046a6ef 100644 --- a/dummy/test.txt +++ b/dummy/test.txt @@ -1 +1,7 @@ -Hello world! + + + Hello 1 + Hello 2 + Hello 3 + Hello 4 + diff --git a/dummy/transform.xsl b/dummy/transform.xsl index bd7cbc7..08d005b 100644 --- a/dummy/transform.xsl +++ b/dummy/transform.xsl @@ -15,17 +15,18 @@ - +
+ +
+ - -
- -
- - diff --git a/src/read_file_command.h b/src/read_file_command.h index 094bb3d..837ec04 100644 --- a/src/read_file_command.h +++ b/src/read_file_command.h @@ -9,7 +9,7 @@ namespace xalan = xalanc_1_11; -class FunctionFileRead : public xalan::Function { +class FunctionReadFile : public xalan::Function { public: virtual xalan::XObjectPtr execute( xalan::XPathExecutionContext& executionContext, @@ -43,7 +43,7 @@ class FunctionFileRead : public xalan::Function { ); } - virtual FunctionFileRead* clone(xalan::MemoryManager& manager) const { + virtual FunctionReadFile* clone(xalan::MemoryManager& manager) const { return xalan::XalanCopyConstruct(manager, *this); } @@ -55,7 +55,7 @@ class FunctionFileRead : public xalan::Function { } private: - FunctionFileRead& operator=(const FunctionFileRead&); - bool operator==(const FunctionFileRead&) const; + FunctionReadFile& operator=(const FunctionReadFile&); + bool operator==(const FunctionReadFile&) const; }; diff --git a/src/read_xml_file_command.h b/src/read_xml_file_command.h new file mode 100644 index 0000000..96b6c5d --- /dev/null +++ b/src/read_xml_file_command.h @@ -0,0 +1,57 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "utility.h" + +namespace xalan = xalanc_1_11; + +class FunctionReadXmlFile : public xalan::Function { + public: + virtual xalan::XObjectPtr execute( + xalan::XPathExecutionContext& executionContext, + xalan::XalanNode* context, + const xalan::Function::XObjectArgVectorType& args, + const xalan::Locator* locator + ) const { + if ( args.size() != 1 ) { + xalan::XPathExecutionContext::GetAndReleaseCachedString guard( + executionContext + ); + + generalError(executionContext, context, locator); + } + + if ( this->liaison == nullptr ) { + const_cast(this)->liaison = new xalan::XercesParserLiaison(); + } + + xalan::XSLTInputSource file(args[0]->str()); + + return executionContext.getXObjectFactory().createNodeSet( + liaison->parseXMLStream(file) + ); + } + + virtual FunctionReadXmlFile* clone(xalan::MemoryManager& manager) const { + return xalan::XalanCopyConstruct(manager, *this); + } + + protected: + xalan::XercesParserLiaison* liaison = nullptr; + + const xalan::XalanDOMString& getError(xalan::XalanDOMString& result) const { + result.assign("The read-file() function expects one argument."); + + return result; + } + + private: + FunctionReadXmlFile& operator=(const FunctionReadXmlFile&); + bool operator==(const FunctionReadXmlFile&) const; + +}; diff --git a/src/utility.h b/src/utility.h index 7050cee..9c88b38 100644 --- a/src/utility.h +++ b/src/utility.h @@ -1,3 +1,6 @@ +#ifndef UTILITY_H_ +#define UTILITY_H_ + #include #include #include @@ -46,3 +49,5 @@ std::string readFile(const std::string& path) { return content; } } + +#endif // UTILITY_H_ diff --git a/test.cc b/test.cc index 28a2cac..bc6f0b2 100644 --- a/test.cc +++ b/test.cc @@ -4,6 +4,7 @@ #include #include "src/read_file_command.h" +#include "src/read_xml_file_command.h" int main() { xercesc::XMLPlatformUtils::Initialize(); @@ -18,7 +19,13 @@ int main() { transformer.installExternalFunction( customNamespace, xalan::XalanDOMString("read-file"), - FunctionFileRead() + FunctionReadFile() + ); + + transformer.installExternalFunction( + customNamespace, + xalan::XalanDOMString("read-xml-file"), + FunctionReadXmlFile() ); xalan::XSLTInputSource input("../dummy/in.xml"); -- cgit v1.2.3