aboutsummaryrefslogtreecommitdiff
path: root/src/function
diff options
context:
space:
mode:
Diffstat (limited to 'src/function')
-rw-r--r--src/function/read_directory.cc40
-rw-r--r--src/function/read_file.cc29
-rw-r--r--src/function/read_xml_file.cc22
-rw-r--r--src/function/transform.cc18
4 files changed, 26 insertions, 83 deletions
diff --git a/src/function/read_directory.cc b/src/function/read_directory.cc
index 215a59e..a3995ec 100644
--- a/src/function/read_directory.cc
+++ b/src/function/read_directory.cc
@@ -3,9 +3,9 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMElement.hpp>
-#include <xercesc/dom/DOMText.hpp>
#include "support/xerces_string_guard.h"
+#include "support/dom/result_node_facade.h"
namespace InputXSLT {
@@ -33,52 +33,34 @@ xercesc::DOMDocument* FunctionReadDirectory::constructDocument(
fsContext.iterate(
directoryPath,
[&domDocument, &rootNode](const boost::filesystem::path& p) {
- xercesc::DOMElement* const itemNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("result"))
- );
+ ResultNodeFacade result(domDocument, rootNode, "result");
switch ( boost::filesystem::status(p).type() ) {
case boost::filesystem::regular_file: {
- itemNode->setAttribute(
- *XercesStringGuard<XMLCh>("type"),
- *XercesStringGuard<XMLCh>("file")
- );
+ result.setAttribute("type", "file");
+ result.setValueNode("name", p.stem().string());
+ result.setValueNode("extension", p.extension().string());
break;
};
case boost::filesystem::directory_file: {
- itemNode->setAttribute(
- *XercesStringGuard<XMLCh>("type"),
- *XercesStringGuard<XMLCh>("directory")
- );
+ result.setAttribute("type", "directory");
+ result.setValueNode("name", p.filename().string());
break;
};
default: {
- itemNode->setAttribute(
- *XercesStringGuard<XMLCh>("type"),
- *XercesStringGuard<XMLCh>("misc")
- );
+ result.setAttribute("type", "misc");
+ result.setValueNode("name", p.filename().string());
break;
};
}
- xercesc::DOMText* const textNode(
- domDocument->createTextNode(
- *XercesStringGuard<XMLCh>(p.filename().string())
- )
- );
-
- itemNode->appendChild(textNode);
- rootNode->appendChild(itemNode);
+ result.setValueNode("full", boost::filesystem::canonical(p).string());
});
} else {
- xercesc::DOMElement* const resultNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("error"))
- );
-
- rootNode->appendChild(resultNode);
+ ResultNodeFacade result(domDocument, rootNode, "error");
}
return domDocument;
diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index 1a870a6..87423ab 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -3,11 +3,11 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMElement.hpp>
-#include <xercesc/dom/DOMText.hpp>
#include "boost/filesystem/fstream.hpp"
#include "support/xerces_string_guard.h"
+#include "support/dom/result_node_facade.h"
namespace {
@@ -51,29 +51,12 @@ xercesc::DOMDocument* FunctionReadFile::constructDocument(
);
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::DOMText* const resultTextNode(
- domDocument->createTextNode(
- *XercesStringGuard<XMLCh>(readFile(filePath))
- )
- );
-
- resultNode->appendChild(resultTextNode);
- rootNode->appendChild(resultNode);
- } else {
- xercesc::DOMElement* const resultNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("error"))
- );
+ ResultNodeFacade result(domDocument, rootNode, "result");
- rootNode->appendChild(resultNode);
+ result.setAttribute("name", filePath.filename().string());
+ result.setContent(readFile(filePath));
+ } else {
+ ResultNodeFacade result(domDocument, rootNode, "error");
}
return domDocument;
diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index 4eb44e5..6d0fd04 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -5,12 +5,12 @@
#include <xercesc/dom/DOMDocument.hpp>
#include <xercesc/dom/DOMImplementation.hpp>
#include <xercesc/dom/DOMElement.hpp>
-#include <xercesc/dom/DOMText.hpp>
#include <xercesc/parsers/XercesDOMParser.hpp>
#include "boost/filesystem/fstream.hpp"
#include "support/xerces_string_guard.h"
+#include "support/dom/result_node_facade.h"
namespace {
@@ -61,27 +61,15 @@ xercesc::DOMDocument* FunctionReadXmlFile::constructDocument(
);
if ( boost::filesystem::is_regular_file(filePath) ) {
- xercesc::DOMElement* const resultNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("result"))
- );
+ ResultNodeFacade result(domDocument, rootNode, "result");
- resultNode->setAttribute(
- *XercesStringGuard<XMLCh>("name"),
- *XercesStringGuard<XMLCh>(filePath.filename().string())
- );
+ result.setAttribute("name", filePath.filename().string());
- xercesc::DOMNode* const resultTreeNode(
+ result.setContent(
importDocumentElement(filePath, domDocument)
);
-
- resultNode->appendChild(resultTreeNode);
- rootNode->appendChild(resultNode);
} else {
- xercesc::DOMElement* const resultNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("error"))
- );
-
- rootNode->appendChild(resultNode);
+ ResultNodeFacade result(domDocument, rootNode, "error");
}
return domDocument;
diff --git a/src/function/transform.cc b/src/function/transform.cc
index cf6ff09..fd28b34 100644
--- a/src/function/transform.cc
+++ b/src/function/transform.cc
@@ -6,6 +6,7 @@
#include "transformation_facade.h"
#include "support/xerces_string_guard.h"
+#include "support/dom/result_node_facade.h"
namespace InputXSLT {
@@ -43,22 +44,11 @@ xercesc::DOMDocument* FunctionTransform::constructDocument(
);
if ( transformation.generate(targetPath, parameterObject) == 0 ) {
- xercesc::DOMElement* const resultNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("result"))
- );
+ ResultNodeFacade result(domDocument, rootNode, "result");
- resultNode->setAttribute(
- *XercesStringGuard<XMLCh>("name"),
- *XercesStringGuard<XMLCh>(targetPath)
- );
-
- rootNode->appendChild(resultNode);
+ result.setAttribute("name", targetPath);
} else {
- xercesc::DOMElement* const resultNode(
- domDocument->createElement(*XercesStringGuard<XMLCh>("error"))
- );
-
- rootNode->appendChild(resultNode);
+ ResultNodeFacade result(domDocument, rootNode, "error");
}
return domDocument;