From 3bc793d95293d40dbab62c593ce4ceaa86fae25b Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Thu, 29 May 2014 13:26:37 +0200
Subject: Improved TransformationFacade error handling * ErrorHandler class
 created in 5859cb6 now caches all errors instead of pushing them to std::cerr
 ** cached errors are retrieved by TransformationFacade's "generate" member
 method * test frontend pushes all errors to std::cerr * FunctionTransform
 returns errors to the calling template as XML ** FunctionTransform test case
 demonstrates how one may test for successful transformation * "generate"
 member method returns std::string vector wrapped in a std::unique_ptr ** this
 is used as a kind of optional pointer, as the std::unique_ptr instance only
 wraps a vector if errors where actually generated

---
 src/function/transform.cc | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/function')

diff --git a/src/function/transform.cc b/src/function/transform.cc
index fd28b34..7e8a844 100644
--- a/src/function/transform.cc
+++ b/src/function/transform.cc
@@ -38,17 +38,22 @@ xercesc::DOMDocument* FunctionTransform::constructDocument(
 		domDocument->getDocumentElement()
 	);
 
+	ResultNodeFacade result(domDocument, rootNode, "result");
+	result.setAttribute("name", targetPath);
+
 	InputXSLT::TransformationFacade transformation(
 		transformationPath,
 		this->include_resolver_
 	);
 
-	if ( transformation.generate(targetPath, parameterObject) == 0 ) {
-		ResultNodeFacade result(domDocument, rootNode, "result");
+	InputXSLT::TransformationFacade::return_type errors(
+		transformation.generate(targetPath, parameterObject)
+	);
 
-		result.setAttribute("name", targetPath);
-	} else {
-		ResultNodeFacade result(domDocument, rootNode, "error");
+	if ( errors ) {
+		for ( auto&& error : *errors ) {
+			result.setValueNode("error", error);
+		}
 	}
 
 	return domDocument;
-- 
cgit v1.2.3