X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=9e19f0914c03a9a14f7a6d9ad8db6dcf68920441;hb=a87410331a3cf42444d92930a9a796a384278c8d;hp=067bf730b6cfa0b2f4af94f64258dd809caee212;hpb=47a96d1f08578ba143b50a7e83c0338dcebcacc6;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 067bf73..9e19f09 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -17,12 +17,23 @@ void clean_node(xmlNode *node)
 		xmlReplaceNode(node, frag);
 		frag->children = node->children;
 		frag->last = node->last;
+
+		node->children = node->last = NULL;
+		xmlFreeNode(node);
 	}
 }
 
+// Does A begin with B?
+bool begins_with(const string &a, const string &b)
+{
+	return (a.compare(0, b.size(), b) == 0);
+}
+
 }  // namespace
 
 Directive::~Directive() {}
+	
+string Directive::get_contents() { return ""; }
 
 Replace::Replace(const string &str)
 	: str(str) {}
@@ -34,9 +45,18 @@ void Replace::process(xmlNode *node, bool clean) {
 	}
 }
 
+string Replace::get_contents() { return str; }
+
 Clone::Clone(const vector<Directive *> &subdirectives)
 	: subdirectives(subdirectives) {}
-	
+
+Clone::Clone(const vector<Substitute *> &subdirectives_subs)
+{
+	for (auto it : subdirectives_subs) {
+		subdirectives.push_back(static_cast<Directive *>(it));
+	}
+}
+
 Clone::Clone(initializer_list<Directive *> subdirectives)
 	: subdirectives(subdirectives) {}
 
@@ -57,9 +77,12 @@ void Clone::process(xmlNode *node, bool clean)
 		xmlNode *new_node;
 		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) {
+		while (new_node->children != NULL) {
+			xmlNode *child = new_node->children;
+			xmlUnlinkNode(child);
 			new_nodes.push_back(child);
 		}
+		xmlFreeNode(new_node);
 	}
 
 	xmlFreeNodeList(node->children);
@@ -73,6 +96,19 @@ void Clone::process(xmlNode *node, bool clean)
 		clean_node(node);
 	}
 }
+	
+Alternate::Alternate(const string &attribute,
+	             const vector<Substitute *> &subdirectives_subs,
+	             const vector<string> &alternatives)
+    : Clone(subdirectives_subs)
+{
+	for (unsigned ix = 0; ix < subdirectives_subs.size(); ++ix) {
+		string value = alternatives[ix % alternatives.size()];
+		subdirectives_subs[ix]->substitution_map.insert(make_pair(
+			attribute,
+			new Replace { value }));
+	} 
+}
 
 Substitute::Substitute(const unordered_map<string, Directive*> &substitution_map)
 	: substitution_map(substitution_map) {}
@@ -89,7 +125,9 @@ Substitute::~Substitute()
 
 void Substitute::process(xmlNode *node, bool clean)
 {
-	for (xmlNode *child = node->children; child != NULL; child = child->next) {
+	xmlNode *next_child;
+	for (xmlNode *child = node->children; child != NULL; child = next_child) {
+		next_child = child->next;	
 		bool processed = false;
 
 		if (child->type == XML_ELEMENT_NODE) {
@@ -97,7 +135,8 @@ void Substitute::process(xmlNode *node, bool clean)
 			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 &&
+				if (attr->ns != NULL &&
+				    strcmp(reinterpret_cast<const char *>(attr->ns->href), "http://template.sesse.net/") == 0 &&
 				    strcmp(reinterpret_cast<const char *>(attr->name), "id") == 0) {
 					xmlChar *id_buf = xmlNodeGetContent(attr->children);
 					id = reinterpret_cast<const char *>(id_buf);
@@ -111,15 +150,36 @@ void Substitute::process(xmlNode *node, bool clean)
 
 			// Check all substitutions to see if we found anything appropriate.
 			for (auto it : substitution_map) {
-				if (it.first == reinterpret_cast<const char *>(child->name) ||
+				string tag = reinterpret_cast<const char *>(child->name);
+
+				// Attribute substitution.
+				if (begins_with(it.first, tag + "/")) {
+					const xmlChar *attr_key = reinterpret_cast<const xmlChar *>(
+						it.first.substr(tag.size() + 1).c_str());
+					const xmlChar *attr_value = reinterpret_cast<const xmlChar *>(
+						it.second->get_contents().c_str());
+					xmlSetProp(child, attr_key, attr_value);
+				} else if ((!id.empty() && begins_with(it.first, "#" + id + "/"))) {
+					const xmlChar *attr_key = reinterpret_cast<const xmlChar *>(
+						it.first.substr(tag.size() + 2).c_str());
+					const xmlChar *attr_value = reinterpret_cast<const xmlChar *>(
+						it.second->get_contents().c_str());
+					xmlSetProp(child, attr_key, attr_value);
+				}
+
+				if (processed) {
+					continue;
+				}
+
+				// Regular substitution.
+				if (it.first == tag ||
 				    (!id.empty() && it.first == ("#" + id))) {
 					it.second->process(child, clean);
 					processed = true;
-					break;
 				}
 			}
 		}
-		
+
 		if (!processed) {
 			process(child, clean);
 		}