Implement attribute handling in C++0x.

[xml-template] / c++0x / xml-template.cpp

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 067bf730b6cfa0b2f4af94f64258dd809caee212..febece21a0b70a2b2bcfd923b350bba2fbedc9e1 100644 (file)
--- 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,6 +45,8 @@ void Replace::process(xmlNode *node, bool clean) {
        }
 }
 
+string Replace::get_contents() { return str; }
+
 Clone::Clone(const vector<Directive *> &subdirectives)
        : subdirectives(subdirectives) {}
        
@@ -57,9 +70,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);
@@ -89,7 +105,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) {
@@ -111,15 +129,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);
                }