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/read_xml_file.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index 6d0fd04..2fa4f13 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -60,16 +60,17 @@ xercesc::DOMDocument* FunctionReadXmlFile::constructDocument(
 		domDocument->getDocumentElement()
 	);
 
-	if ( boost::filesystem::is_regular_file(filePath) ) {
-		ResultNodeFacade result(domDocument, rootNode, "result");
+	ResultNodeFacade result(domDocument, rootNode, "file");
+	result.setAttribute("path", filePath.string());
 
-		result.setAttribute("name", filePath.filename().string());
+	if ( boost::filesystem::is_regular_file(filePath) ) {
+		result.setAttribute("result", "success");
 
 		result.setContent(
 			importDocumentElement(filePath, domDocument)
 		);
 	} else {
-		ResultNodeFacade result(domDocument, rootNode, "error");
+		result.setAttribute("result", "error");
 	}
 
 	return domDocument;
-- 
cgit v1.2.3