From 42a0b31ebc10bea7e205e04c12b590afbcc27b3d Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Wed, 30 Apr 2014 18:48:23 +0200
Subject: Moved file reading functionality into local functions * it was moved
 into functions local to the respective compilation unit to improve
 readability ** splits DOM tree construction logic from the actual purpose of
 the external function

---
 src/function/read_xml_file.cc | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 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 7b54732..bf9ec2e 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -10,6 +10,24 @@
 
 #include "support/xerces_string_guard.h"
 
+namespace {
+
+inline xercesc::DOMNode* importDocumentElement(
+	const boost::filesystem::path& filePath,
+	xercesc::DOMDocument* const domDocument
+) {
+	xercesc::XercesDOMParser parser;
+	boost::filesystem::ifstream file(filePath);
+	parser.parse(xalan::XSLTInputSource(file));
+
+	return domDocument->importNode(
+		parser.getDocument()->getDocumentElement(),
+		true
+	);
+}
+
+}
+
 namespace InputXSLT {
 
 FunctionReadXmlFile::FunctionReadXmlFile(const FilesystemContext& context):
@@ -49,15 +67,8 @@ xalan::XObjectPtr FunctionReadXmlFile::execute(
 				*XercesStringGuard(filePath.filename().string())
 			);
 
-			xercesc::XercesDOMParser parser;
-			boost::filesystem::ifstream file(filePath);
-			parser.parse(xalan::XSLTInputSource(file));
-
 			xercesc::DOMNode* const resultTreeNode(
-				domDocument->importNode(
-					parser.getDocument()->getDocumentElement(),
-					true
-				)
+				importDocumentElement(filePath, domDocument)
 			);
 
 			resultNode->appendChild(resultTreeNode);
-- 
cgit v1.2.3