X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=php5-swig%2Fxml-template.swig;h=9cd270ec3126b115e1dc24a0fd5b5bbedd226828;hb=a63f7668246665117f7907ca0c94dba57d6df297;hp=a2dd2d1926c6925149c9d41e05c327bab3a8684e;hpb=8ad17ad06612ee08a69572186858be074b0c5c99;p=xml-template

diff --git a/php5-swig/xml-template.swig b/php5-swig/xml-template.swig
index a2dd2d1..9cd270e 100644
--- a/php5-swig/xml-template.swig
+++ b/php5-swig/xml-template.swig
@@ -1,9 +1,22 @@
 %module XML_Template_SWIG
+%include <std_string.i>
+
+struct XmlDocPtrWrapper {
+	~XmlDocPtrWrapper();
+};
 
 %{
 
+#include <memory>
+
 #include "../c++11/xml-template.h"
-		
+
+struct XmlDocWrapper {
+	~XmlDocWrapper() { xmlFreeDoc(ptr); }
+	xmlDocPtr ptr;
+};
+typedef std::shared_ptr<XmlDocWrapper> XmlDocPtrWrapper;
+
 bool is_associative_array(HashTable *ht)
 {
 	if (ht->nNumOfElements == 0) {
@@ -59,14 +72,14 @@ Directive* convert_php_objects_to_directive(zval *obj)
 		return new Replace(str);
 	}
 	case IS_RESOURCE: {
-		xmlDocPtr *doc;
-		if (SWIG_ConvertPtr(obj, (void **)&doc, SWIGTYPE_p_xmlDocPtr, 0) < 0 || doc == NULL) {
+		XmlDocPtrWrapper *doc;
+		if (SWIG_ConvertPtr(obj, (void **)&doc, SWIGTYPE_p_XmlDocPtrWrapper, 0) < 0 || doc == NULL) {
 			return NULL;
 		}
-		return new ReplaceInclude(xmlCopyDoc(*doc, 1));
+		return new ReplaceInclude(xmlCopyDoc((*doc)->ptr, 1));
 	}
 	case IS_NULL:
-		return NULL;
+		return new Replace { "" };
 	default:
 		printf("WARNING: Unknown type %d!\n", Z_TYPE_P(obj));
 		break;
@@ -75,19 +88,50 @@ Directive* convert_php_objects_to_directive(zval *obj)
 	return NULL;
 }
 
-xmlDocPtr XML_Template_process_file(const char *input_filename, Directive *root_directive, bool clean)
+XmlDocPtrWrapper XML_Template_process_file(const std::string &input_filename, Directive *root_directive, bool clean)
 {
 	xmlDocPtr ret = process_file(input_filename, root_directive, clean);
 	delete root_directive;
-	return ret;
+	return XmlDocPtrWrapper(new XmlDocWrapper { ret });
+}
+
+void XML_Template_process(XmlDocPtrWrapper doc, Directive *root_directive, bool clean)
+{
+	root_directive->process(xmlDocGetRootElement(doc->ptr), clean);
+	delete root_directive;
+}
+
+namespace {
+
+int write_to_string(void *context, const char *buffer, int len)
+{
+	std::string *str = reinterpret_cast<std::string *>(context);
+	str->append(buffer, len);
+	return len;
+}
+
+int close_string(void *context)
+{
+	return 0;
 }
 
+}  // namespace
+
+std::string XML_Template_convert_doc_to_string(XmlDocPtrWrapper doc)
+{
+	std::string ret;
+	xmlOutputBufferPtr buf = xmlOutputBufferCreateIO(write_to_string, close_string, &ret, NULL);
+	xmlSaveFileTo(buf, doc->ptr, NULL);
+	return ret;
+}
+	
 %}
 
 %typemap(in) Directive* {
 	$1 = convert_php_objects_to_directive(*$input);
 }
 
-xmlDocPtr XML_Template_process_file(const char *input_filename, Directive *root_directive, bool clean);
-void output_to_fd_and_free(xmlDocPtr doc, int fd);
+XmlDocPtrWrapper XML_Template_process_file(const std::string &input_filename, Directive *root_directive, bool clean);
+void XML_Template_process(XmlDocPtrWrapper doc, Directive *root_directive, bool clean);
+std::string XML_Template_convert_doc_to_string(XmlDocPtrWrapper doc);