From 1a744712426c9c19019b8ebebdd0c703aae204a6 Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Sat, 31 May 2014 14:18:48 +0200
Subject: Revamped external function result trees * the root node of the result
 tree of each function is a domain element ** i.e. the root node of
 "read-xml-file" is "file", the root node of "read-directory" is "directory" *
 the root node contains the result state of the function call encoded in a
 "result" attribute ** possible values are "success" and "error" ** the root
 node may contain additional attributes such as the target path of a called
 transformation * the actual function result is contained within the child
 nodes of the function root node ** i.e. the XML file tree returned by
 "read-xml-file" is a child of the function root node ** if specific errors
 occured they are also returned as child nodes of the function root node ***
 this is currently only the case for "transform" where transformation errors
 are returned as "error" value node childs of the function root node * updated
 test cases accordingly

---
 src/function/external_text_formatter.cc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/function/external_text_formatter.cc')

diff --git a/src/function/external_text_formatter.cc b/src/function/external_text_formatter.cc
index d1b9e92..22f53c5 100644
--- a/src/function/external_text_formatter.cc
+++ b/src/function/external_text_formatter.cc
@@ -86,17 +86,20 @@ xercesc::DOMDocument* FunctionExternalTextFormatter::constructDocument(
 
 	boost::process::status status = formatterProcess.wait();
 
-	if ( status.exited() ) {
-		ResultNodeFacade result(domDocument, rootNode, "result");
+	ResultNodeFacade result(domDocument, rootNode, "output");
+	result.setAttribute("formatter", formatterPath);
+	result.setAttribute("code",      std::to_string(status.exit_status()));
 
-		result.setValueNode("code", std::to_string(status.exit_status()));
-		result.setContent(importDocumentElement(outputStream, domDocument));
+	if ( status.exited() ) {
+		result.setAttribute("result", "success");
+		result.setContent(
+			importDocumentElement(outputStream, domDocument)->getChildNodes()
+		);
 	} else {
-		ResultNodeFacade result(domDocument, rootNode, "error");
-
-		result.setValueNode("code", std::to_string(status.exit_status()));
+		result.setAttribute("result", "error");
 	}
 
+
 	return domDocument;
 }
 
-- 
cgit v1.2.3