1 files changed, 47 insertions, 39 deletions

diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index 0fa21fe..a4e3e3c 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -13,6 +13,8 @@
 
 namespace {
 
+using InputXSLT::XercesStringGuard;
+
 inline xercesc::DOMNode* importDocumentElement(
 	const boost::filesystem::path& filePath,
 	xercesc::DOMDocument* const domDocument
@@ -27,6 +29,48 @@ inline xercesc::DOMNode* importDocumentElement(
 	);
 }
 
+xercesc::DOMDocument* constructDocument(
+	const boost::filesystem::path& filePath
+) {
+	xercesc::DOMDocument* const domDocument(
+		xercesc::DOMImplementation::getImplementation()->createDocument(
+			nullptr,
+			*XercesStringGuard<XMLCh>("content"),
+			nullptr
+		)
+	);
+
+	xercesc::DOMNode* const rootNode(
+		domDocument->getDocumentElement()
+	);
+
+	if ( boost::filesystem::is_regular_file(filePath) ) {
+		xercesc::DOMElement* const resultNode(
+			domDocument->createElement(*XercesStringGuard<XMLCh>("result"))
+		);
+
+		resultNode->setAttribute(
+			*XercesStringGuard<XMLCh>("name"),
+			*XercesStringGuard<XMLCh>(filePath.filename().string())
+		);
+
+		xercesc::DOMNode* const resultTreeNode(
+			importDocumentElement(filePath, domDocument)
+		);
+
+		resultNode->appendChild(resultTreeNode);
+		rootNode->appendChild(resultNode);
+	} else {
+		xercesc::DOMElement* const resultNode(
+			domDocument->createElement(*XercesStringGuard<XMLCh>("error"))
+		);
+
+		rootNode->appendChild(resultNode);
+	}
+
+	return domDocument;
+}
+
 }
 
 namespace InputXSLT {
@@ -40,10 +84,10 @@ xalan::XObjectPtr FunctionReadXmlFile::execute(
 	const xalan::XObjectPtr argument,
 	const xalan::Locator* locator
 ) const {
-	const FilesystemContext fs_context(locator);
+	const FilesystemContext fsContext(locator);
 
 	const boost::filesystem::path filePath(
-		fs_context.resolve(argument->str())
+		fsContext.resolve(argument->str())
 	);
 
 	DomDocumentCache::optional_item optionalCachedDocument(
@@ -51,45 +95,9 @@ xalan::XObjectPtr FunctionReadXmlFile::execute(
 	);
 
 	if ( !optionalCachedDocument.first ) {
-		xercesc::DOMDocument* const domDocument(
-			xercesc::DOMImplementation::getImplementation()->createDocument(
-				nullptr,
-				*XercesStringGuard<XMLCh>("content"),
-				nullptr
-			)
-		);
-
-		xercesc::DOMNode* const rootNode(
-			domDocument->getDocumentElement()
-		);
-
-		if ( boost::filesystem::is_regular_file(filePath) ) {
-			xercesc::DOMElement* const resultNode(
-				domDocument->createElement(*XercesStringGuard<XMLCh>("result"))
-			);
-
-			resultNode->setAttribute(
-				*XercesStringGuard<XMLCh>("name"),
-				*XercesStringGuard<XMLCh>(filePath.filename().string())
-			);
-
-			xercesc::DOMNode* const resultTreeNode(
-				importDocumentElement(filePath, domDocument)
-			);
-
-			resultNode->appendChild(resultTreeNode);
-			rootNode->appendChild(resultNode);
-		} else {
-			xercesc::DOMElement* const resultNode(
-				domDocument->createElement(*XercesStringGuard<XMLCh>("error"))
-			);
-
-			rootNode->appendChild(resultNode);
-		}
-
 		optionalCachedDocument = this->document_cache_->create(
 			filePath.string(),
-			domDocument
+			constructDocument(filePath)
 		);
 	}