X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=php5-swig%2Fxml-template.swig;h=2feceba72843fada4f12226cfd7acf6ff36361cf;hb=2cb15f2dccf0c8966ac064389146b0e84a1cfa07;hp=5a560cee6883bf4bce903964fe653ee2755a71c5;hpb=0ccbc5e506ee3ed6bcc77bc4d6cdbde9791e8ad5;p=xml-template

diff --git a/php5-swig/xml-template.swig b/php5-swig/xml-template.swig
index 5a560ce..2feceba 100644
--- a/php5-swig/xml-template.swig
+++ b/php5-swig/xml-template.swig
@@ -10,9 +10,7 @@ bool is_associative_array(HashTable *ht)
 		return true;
 	}
 	for (unsigned i = 0; i < ht->nNumOfElements; ++i) {
-		char buf[32];
-		sprintf(buf, "%u", i);
-		if (!zend_hash_exists(ht, buf, strlen(buf))) {
+		if (!zend_hash_index_exists(ht, i)) {
 			return true;
 		}
 	}
@@ -46,7 +44,13 @@ Directive* convert_php_objects_to_directive(zval *obj)
 			}
 			return new Substitute(my_map);
 		} else {
-			printf("ARRAY\n");
+			std::vector<Directive *> subdirectives;
+			for (unsigned i = 0; i < ht->nNumOfElements; ++i) {
+				zval **data;
+				zend_hash_index_find(ht, i, (void **)&data);
+				subdirectives.push_back(convert_php_objects_to_directive(*data));
+			}
+			return new Clone(subdirectives);
 		}
 		break;
 	}
@@ -54,6 +58,8 @@ Directive* convert_php_objects_to_directive(zval *obj)
 		char *str = Z_STRVAL_P(obj);
 		return new Replace(str);
 	}
+	case IS_NULL:
+		return NULL;
 	default:
 		printf("WARNING: Unknown type %d!\n", Z_TYPE_P(obj));
 		break;
@@ -62,12 +68,19 @@ Directive* convert_php_objects_to_directive(zval *obj)
 	return NULL;
 }
 
+xmlDocPtr XML_Template_process_file(const char *input_filename, Directive *root_directive, bool clean)
+{
+	xmlDocPtr ret = process_file(input_filename, root_directive, clean);
+	delete root_directive;
+	return ret;
+}
+
 %}
 
 %typemap(in) Directive* {
 	$1 = convert_php_objects_to_directive(*$input);
 }
 
-xmlDocPtr process_file(const char *input_filename, Directive *root_directive, bool clean);
+xmlDocPtr XML_Template_process_file(const char *input_filename, Directive *root_directive, bool clean);
 void output_to_fd_and_free(xmlDocPtr doc, int fd);