X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=5bbcb9b5dbeec7079a1b436118fc3f7a858eaaeb;hb=6d6f69fcdf45c3afc82212c5c3d8085c93ec4717;hp=e8fc0edb086678d12ebea5eddc04fe355478d7e9;hpb=ad45bc892752571fec46b21564e4683c074f1d46;p=xml-template

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index e8fc0ed..5bbcb9b 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -12,7 +12,8 @@ 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) {
+	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;
@@ -47,6 +48,39 @@ void Replace::process(xmlNode *node, bool clean) {
 
 string Replace::get_contents() { return str; }
 
+ReplaceInclude::ReplaceInclude(xmlNodePtr included_node)
+	: included_node(included_node),
+	  included_doc(NULL) {}
+	
+ReplaceInclude::ReplaceInclude(xmlDocPtr included_doc)
+	: included_node(xmlDocGetRootElement(included_doc)),
+	  included_doc(included_doc) {}
+
+ReplaceInclude::~ReplaceInclude()
+{
+	if (included_doc != NULL) {
+		xmlFreeDoc(included_doc);
+	} else {
+		xmlFreeNode(included_node);
+	}
+}
+
+void ReplaceInclude::process(xmlNode *node, bool clean) {
+	xmlFreeNodeList(node->children);
+	node->content = NULL;
+	node->children = node->last = NULL; 
+
+	xmlNode *new_node;
+	xmlDOMWrapCloneNode(NULL, NULL, included_node, &new_node, node->doc, node, 1, 0);
+	xmlAddChild(node, new_node);
+
+	if (clean) {
+		Substitute dummy_subs {};
+		dummy_subs.process(new_node, clean);
+		clean_node(node);
+	}
+}
+
 Clone::Clone(const vector<Directive *> &subdirectives)
 	: subdirectives(subdirectives) {}
 
@@ -197,12 +231,13 @@ void Substitute::process(xmlNode *node, bool clean)
 }
 	
 xmlDocPtr process_file(const string &input_filename,
-                       Directive *root_directive)
+                       Directive *root_directive,
+                       bool clean)
 {
 	LIBXML_TEST_VERSION
 
 	xmlDocPtr doc = xmlParseFile(input_filename.c_str());
-	root_directive->process(xmlDocGetRootElement(doc), true);
+	root_directive->process(xmlDocGetRootElement(doc), clean);
 	xmlCleanupParser();
 	xmlMemoryDump();
 	return doc;