}
if (node->ns != NULL &&
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;
+ while (node->children != NULL) {
+ xmlAddPrevSibling(node, node->children);
+ }
- node->children = node->last = NULL;
+ xmlUnlinkNode(node);
xmlFreeNode(node);
}
}
{
xmlNode *next_child;
for (xmlNode *child = node->children; child != NULL; child = next_child) {
- next_child = child->next;
- bool processed = false;
+ next_child = child->next;
+ Directive *next_processor = this;
if (child->type == XML_ELEMENT_NODE) {
// Find the ID, if any.
}
// Check all substitutions to see if we found anything appropriate.
+ string tag = reinterpret_cast<const char *>(child->name);
for (auto it : substitution_map) {
- string tag = reinterpret_cast<const char *>(child->name);
-
// Attribute substitution.
if (begins_with(it.first, tag + "/")) {
const xmlChar *attr_key = reinterpret_cast<const xmlChar *>(
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.c_str() + tag.size() + 2);
+ it.first.c_str() + id.size() + 2);
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.
+ // Regular substitution. (Don't call process() immediately, because
+ // that might delete the element, which would cause problems.)
if (it.first == tag ||
(!id.empty() && it.first == ("#" + id))) {
- it.second->process(child, clean);
- processed = true;
+ next_processor = it.second;
}
}
}
- if (!processed) {
- process(child, clean);
- }
+ next_processor->process(child, clean);
}
if (clean) {
clean_node(node);