X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=e6e88a30a31e1347deb1ab3b3e78bac34bd72493;hb=620912444e16e4da049b124badd28acde29ce645;hp=ac686502afc6e06b064f04938bfcb69662e675ff;hpb=2a1e1743bfb0c982636a45f25ff3fc56470601bb;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index ac68650..e6e88a3 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -16,16 +16,19 @@ void clean_node(xmlNode *node)
 		xmlNode *frag = xmlNewDocFragment(node->doc);
 		xmlReplaceNode(node, frag);
 		frag->children = node->children;
+		frag->last = node->last;
 	}
 }
 
 }  // namespace
 
+Directive::~Directive() {}
+
 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());
+	xmlNodeSetContentLen(node, reinterpret_cast<const xmlChar *>(str.data()), str.size());
 	if (clean) {
 		clean_node(node);
 	}
@@ -37,6 +40,13 @@ Clone::Clone(const vector<Directive *> &subdirectives)
 Clone::Clone(initializer_list<Directive *> subdirectives)
 	: subdirectives(subdirectives) {}
 
+Clone::~Clone()
+{
+	for (auto it : subdirectives) {
+		delete it;
+	}
+}
+
 void Clone::process(xmlNode *node, bool clean)
 {
 	// We can't use xmlNewDocFragment, since xmlDOMWrapCloneNode only knows
@@ -52,7 +62,10 @@ void Clone::process(xmlNode *node, bool clean)
 		}
 	}
 
-	node->children = NULL;
+	xmlFreeNodeList(node->children);
+	node->content = NULL;
+	node->children = node->last = NULL;
+
 	for (auto child : new_nodes) {
 		xmlAddChild(node, child);
 	}	
@@ -67,6 +80,13 @@ Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map
 Substitute::Substitute(initializer_list<pair<const string, Directive*>> substitution_map)
 	: substitution_map(substitution_map) {}
 
+Substitute::~Substitute()
+{
+	for (auto it : substitution_map) {
+		delete it.second;
+	}
+}
+
 void Substitute::process(xmlNode *node, bool clean)
 {
 	for (xmlNode *child = node->children; child != NULL; child = child->next) {
@@ -75,20 +95,17 @@ void Substitute::process(xmlNode *node, bool clean)
 		if (child->type == XML_ELEMENT_NODE) {
 			// Find the ID, if any.
 			string id;
+			xmlAttr *id_attr = NULL;
 			for (xmlAttr *attr = child->properties; attr != NULL; attr = attr->next) {
 				if (strcmp(reinterpret_cast<const char *>(attr->ns->href), "http://template.sesse.net/") == 0 &&
 				    strcmp(reinterpret_cast<const char *>(attr->name), "id") == 0) {
 					id = reinterpret_cast<const char *>(xmlNodeGetContent(attr->children));
-
-					if (clean) {
-						if (attr->prev == NULL) {
-							child->properties = attr->next;
-						} else {
-							attr->prev->next = attr->next;
-						}
-					}
+					id_attr = attr;
 				}
 			}
+			if (clean && id_attr != NULL) {
+				xmlRemoveProp(id_attr);
+			}
 
 			// Check all substitutions to see if we found anything appropriate.
 			for (auto it : substitution_map) {
@@ -119,6 +136,7 @@ void process_file(const string &input_filename,
 	xmlDocPtr doc = xmlParseFile(input_filename.c_str());
 	root_directive->process(xmlDocGetRootElement(doc), true);
 	xmlSaveFile(output_filename.c_str(), doc);
+	xmlFreeDoc(doc);
 
 	xmlCleanupParser();
 	xmlMemoryDump();