X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;fp=c%2B%2B0x%2Fxml-template.cpp;h=1e727613160acf49fb1ec860b88179b0fd7aecb5;hb=e772f92e8c2124293715855f5f05ecba7d407ec2;hp=7278236d911d6b50d4a1236a97fd6c8e5df8df7e;hpb=d8b19f8693d9521d2ccb6ef3c036d2cacc83a9ab;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 7278236..1e72761 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -5,11 +5,30 @@
 
 using namespace std;
 
+namespace {
+
+void clean_node(xmlNode *node)
+{
+	if (node->type != XML_ELEMENT_NODE) {
+		return;
+	}
+	if (strcmp(reinterpret_cast<const char *>(node->ns->href), "http://template.sesse.net/") == 0) {
+		xmlNode *frag = xmlNewDocFragment(node->doc);
+		xmlReplaceNode(node, frag);
+		frag->children = node->children;
+	}
+}
+
+}  // namespace
+
 Replace::Replace(const string &str)
 	: str(str) {}
 
 void Replace::process(xmlNode *node, bool clean) {
 	node->children = xmlNewTextLen(reinterpret_cast<const xmlChar *>(str.data()), str.size());
+	if (clean) {
+		clean_node(node);
+	}
 }
 
 Clone::Clone(const std::vector<Directive *> &subdirectives)
@@ -21,9 +40,8 @@ void Clone::process(xmlNode *node, bool clean) {
 	vector<xmlNode *> new_nodes;
 
 	for (auto it : subdirectives) {
-		xmlDOMWrapCtxt ctx;
 		xmlNode *new_node;
-		int ret = xmlDOMWrapCloneNode(NULL, node->doc, node, &new_node, node->doc, NULL, 1, 0);
+		xmlDOMWrapCloneNode(NULL, node->doc, node, &new_node, node->doc, NULL, 1, 0);
 		it->process(new_node, clean);
 		for (xmlNode *child = new_node->children; child != NULL; child = child->next) {
 			new_nodes.push_back(child);
@@ -34,6 +52,9 @@ void Clone::process(xmlNode *node, bool clean) {
 	for (auto child : new_nodes) {
 		xmlAddChild(node, child);
 	}	
+	if (clean) {
+		clean_node(node);
+	}
 }
 
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
@@ -76,6 +97,9 @@ void Substitute::process(xmlNode *node, bool clean) {
 			process(child, clean);
 		}
 	}
+	if (clean) {
+		clean_node(node);
+	}
 }
 	
 void process_file(const string &input_filename,