X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=96f027033ba30acf87ca50af3c6a22a49ed03ef8;hb=8e1d37633979005acd694fc86ee91b724fe4361b;hp=3be1407b3b5592d93b6768859135a90dfc26481f;hpb=e80f2b44f155a6d93d1485657c4cd2008e06f5ad;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 3be1407..96f0270 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -5,29 +5,112 @@
 
 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;
+		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);
+	}
+}
+
+Clone::Clone(const vector<Directive *> &subdirectives)
+	: subdirectives(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
+	// how to clone elements.
+	vector<xmlNode *> new_nodes;
+
+	for (auto it : subdirectives) {
+		xmlNode *new_node;
+		xmlDOMWrapCloneNode(NULL, node->doc, node, &new_node, node->doc, NULL, 1, 0);
+		it->process(new_node, clean);
+		while (new_node->children != NULL) {
+			xmlNode *child = new_node->children;
+			xmlUnlinkNode(child);
+			new_nodes.push_back(child);
+		}
+		xmlFreeNode(new_node);
+	}
+
+	xmlFreeNodeList(node->children);
+	node->content = NULL;
+	node->children = node->last = NULL;
+
+	for (auto child : new_nodes) {
+		xmlAddChild(node, child);
+	}	
+	if (clean) {
+		clean_node(node);
+	}
 }
 
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
 	: substitution_map(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) {
+void Substitute::process(xmlNode *node, bool clean)
+{
 	for (xmlNode *child = node->children; child != NULL; child = child->next) {
 		bool processed = false;
 
 		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));
+					xmlChar *id_buf = xmlNodeGetContent(attr->children);
+					id = reinterpret_cast<const char *>(id_buf);
+					xmlFree(id_buf);
+					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) {
@@ -44,6 +127,9 @@ void Substitute::process(xmlNode *node, bool clean) {
 			process(child, clean);
 		}
 	}
+	if (clean) {
+		clean_node(node);
+	}
 }
 	
 void process_file(const string &input_filename,
@@ -53,8 +139,9 @@ void process_file(const string &input_filename,
 	LIBXML_TEST_VERSION
 
 	xmlDocPtr doc = xmlParseFile(input_filename.c_str());
-	root_directive->process(xmlDocGetRootElement(doc), false);
+	root_directive->process(xmlDocGetRootElement(doc), true);
 	xmlSaveFile(output_filename.c_str(), doc);
+	xmlFreeDoc(doc);
 
 	xmlCleanupParser();
 	xmlMemoryDump();