#include "ext/standard/info.h"
#define PHP_XPATH 1
#define PHP_XPTR 2
-/* DOMXML API_VERSION, please bump it up, if you change anything in the API
- therefore it's easier for the script-programmers to check, what's working how
- Can be checked with phpversion("domxml");
-*/
-#define DOMXML_API_VERSION "20020516"
/* General macros used by domxml */
-#define DOMXML_DOMOBJ_NEW(zval, obj, ret) if (NULL == (zval = php_domobject_new(obj, ret TSRMLS_CC))) { \
+
+#define DOMXML_IS_TYPE(zval, ce) (zval && Z_TYPE_P(zval) == IS_OBJECT && Z_OBJCE_P(zval)->refcount == ce->refcount)
+
+#define DOMXML_DOMOBJ_NEW(zval, obj, ret) if (NULL == (zval = php_domobject_new(obj, ret, zval TSRMLS_CC))) { \
php_error(E_WARNING, "%s(): cannot create required DOM object", \
get_active_function_name(TSRMLS_C)); \
RETURN_FALSE; \
PHP_FE(html_doc, NULL)
PHP_FE(html_doc_file, NULL)
#endif
- PHP_FE(domxml_xmltree, NULL)
- PHP_FALIAS(xmltree, domxml_xmltree, NULL)
- PHP_FE(domxml_substitute_entities_default, NULL)
+ PHP_FE(domxml_xmltree, NULL)
+ PHP_FALIAS(xmltree, domxml_xmltree, NULL)
+ PHP_FE(domxml_substitute_entities_default, NULL)
PHP_FE(domxml_doc_document_element, NULL)
PHP_FE(domxml_doc_add_root, NULL)
PHP_FE(domxml_doc_set_root, NULL)
PHP_FE(domxml_node_set_content, NULL)
PHP_FE(domxml_node_get_content, NULL)
PHP_FE(domxml_new_xmldoc, NULL)
- PHP_FALIAS(domxml_new_doc, domxml_new_xmldoc, NULL)
+ PHP_FALIAS(domxml_new_doc, domxml_new_xmldoc, NULL)
PHP_FE(domxml_parser, NULL)
PHP_FE(domxml_parser_add_chunk, NULL)
PHP_FE(domxml_parser_end, NULL)
static function_entry php_domxmldoc_class_functions[] = {
+ PHP_FALIAS(domdocument, xmldoc, NULL)
PHP_FALIAS(doctype, domxml_doc_doctype, NULL)
PHP_FALIAS(implementation, domxml_doc_implementation, NULL)
PHP_FALIAS(document_element, domxml_doc_document_element, NULL)
PHP_FALIAS(dumpmem, domxml_dump_mem, NULL)
PHP_FALIAS(dump_mem, domxml_dump_mem, NULL)
PHP_FALIAS(dump_mem_file, domxml_dump_mem_file, NULL)
- PHP_FALIAS(dump_file, domxml_dump_mem_file, NULL)
+ PHP_FALIAS(dump_file, domxml_dump_mem_file, NULL)
#if defined(LIBXML_HTML_ENABLED)
PHP_FALIAS(html_dump_mem, domxml_html_dump_mem, NULL)
#endif
};
static zend_function_entry php_domxmlelement_class_functions[] = {
- PHP_FALIAS(domelement, domxml_element, NULL)
+ PHP_FALIAS(domelement, domxml_doc_create_element, NULL)
PHP_FALIAS(name, domxml_elem_tagname, NULL)
PHP_FALIAS(tagname, domxml_elem_tagname, NULL)
PHP_FALIAS(get_attribute, domxml_elem_get_attribute, NULL)
};
static zend_function_entry php_domxmlcdata_class_functions[] = {
+ PHP_FALIAS(domcdata, domxml_doc_create_cdata_section,NULL)
PHP_FALIAS(length, domxml_cdata_length, NULL)
{NULL, NULL, NULL}
};
static zend_function_entry php_domxmltext_class_functions[] = {
+ PHP_FALIAS(domtext, domxml_doc_create_text_node, NULL)
{NULL, NULL, NULL}
};
static zend_function_entry php_domxmlcomment_class_functions[] = {
+ PHP_FALIAS(domcomment, domxml_doc_create_comment, NULL)
{NULL, NULL, NULL}
};
};
static zend_function_entry php_domxmlentityref_class_functions[] = {
+ PHP_FALIAS(domentityreference, domxml_doc_create_entity_reference, NULL)
{NULL, NULL, NULL}
};
};
static zend_function_entry php_domxmlpi_class_functions[] = {
+ PHP_FALIAS(domprocessinginstruction, domxml_doc_create_processing_instruction, NULL)
PHP_FALIAS(target, domxml_pi_target, NULL)
PHP_FALIAS(data, domxml_pi_data, NULL)
{NULL, NULL, NULL}
#endif
static zend_function_entry php_domxmlattr_class_functions[] = {
+ PHP_FALIAS(domattribute, domxml_doc_create_attribute, NULL)
PHP_FALIAS(name, domxml_attr_name, NULL)
PHP_FALIAS(value, domxml_attr_value, NULL)
PHP_FALIAS(specified, domxml_attr_specified, NULL)
{
xmlNodePtr node = (xmlNodePtr) rsrc->ptr;
- /* if node has no parent, it will not be freed by php_free_xml_doc, so do it here
+ /* if node has no parent, it will not be freed by php_free_xml_doc, so do it here
and for all children as well. */
if (node->parent == NULL) {
attr_list_wrapper_dtor(node->properties);
node_list_wrapper_dtor(node->children);
- node_wrapper_dtor(node);
+ node_wrapper_dtor(node);
xmlFreeNode(node);
} else {
node_wrapper_dtor(node);
if (parser) {
zval *wrapper = dom_object_get_data(parser);
- zval_ptr_dtor(&wrapper);
+ zval_ptr_dtor(&wrapper);
xmlFreeParserCtxt(parser);
}
}
}
-static zval *php_domobject_new(xmlNodePtr obj, int *found TSRMLS_DC)
+PHPAPI zval *php_domobject_new(xmlNodePtr obj, int *found, zval *wrapper_in TSRMLS_DC)
{
zval *wrapper;
char *content;
*found = 0;
if (!obj) {
- MAKE_STD_ZVAL(wrapper);
+ if(!wrapper_in)
+ {
+ MAKE_STD_ZVAL(wrapper);
+ }
+ else
+ wrapper = wrapper_in;
ZVAL_NULL(wrapper);
return wrapper;
}
return wrapper;
}
- MAKE_STD_ZVAL(wrapper);
+ if(!wrapper_in)
+ {
+ MAKE_STD_ZVAL(wrapper);
+ }
+ else
+ wrapper = wrapper_in;
switch (Z_TYPE_P(obj)) {
case XML_ELEMENT_NODE:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlelement_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlelement_class_entry);
rsrc_type = le_domxmlelementp;
add_property_long(wrapper, "type", Z_TYPE_P(nodep));
add_property_stringl(wrapper, "tagname", (char *) nodep->name, strlen(nodep->name), 1);
case XML_TEXT_NODE:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmltext_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmltext_class_entry);
rsrc_type = le_domxmltextp;
content = xmlNodeGetContent(nodep);
add_property_long(wrapper, "type", Z_TYPE_P(nodep));
case XML_COMMENT_NODE:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlcomment_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlcomment_class_entry);
rsrc_type = le_domxmlcommentp;
content = xmlNodeGetContent(nodep);
if (content) {
case XML_PI_NODE:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlpi_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlpi_class_entry);
rsrc_type = le_domxmlpip;
content = xmlNodeGetContent(nodep);
add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
case XML_ENTITY_REF_NODE:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlentityref_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlentityref_class_entry);
rsrc_type = le_domxmlentityrefp;
add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
break;
case XML_ELEMENT_DECL:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlnode_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlnode_class_entry);
rsrc_type = le_domxmlnodep;
add_property_long(wrapper, "type", Z_TYPE_P(nodep));
add_property_stringl(wrapper, "name", (char *) nodep->name, strlen(nodep->name), 1);
case XML_ATTRIBUTE_NODE:
{
xmlAttrPtr attrp = (xmlAttrPtr) obj;
- object_init_ex(wrapper, domxmlattr_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlattr_class_entry);
rsrc_type = le_domxmlattrp;
add_property_long(wrapper, "type", Z_TYPE_P(attrp));
add_property_stringl(wrapper, "name", (char *) attrp->name, strlen(attrp->name), 1);
{
xmlDocPtr docp = (xmlDocPtr) obj;
- object_init_ex(wrapper, domxmldoc_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmldoc_class_entry);
rsrc_type = le_domxmldocp;
if (docp->name)
add_property_stringl(wrapper, "name", (char *) docp->name, strlen(docp->name), 1);
case XML_DOCUMENT_TYPE_NODE:
{
xmlDtdPtr dtd = (xmlDtdPtr) obj;
- object_init_ex(wrapper, domxmldoctype_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmldoctype_class_entry);
/* rsrc_type = le_domxmldtdp; */
rsrc_type = le_domxmldoctypep;
/* add_property_long(wrapper, "type", Z_TYPE_P(dtd)); */
case XML_CDATA_SECTION_NODE:
{
xmlNodePtr nodep = obj;
- object_init_ex(wrapper, domxmlcdata_class_entry);
+ if(!wrapper_in)
+ object_init_ex(wrapper, domxmlcdata_class_entry);
rsrc_type = le_domxmlcdatap;
content = xmlNodeGetContent(nodep);
add_property_long(wrapper, "type", Z_TYPE_P(nodep));
le_domxsltstylesheetp = zend_register_list_destructors_ex(php_free_xslt_stylesheet, NULL, "xsltstylesheet", module_number);
#endif
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNode", php_domxmlnode_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domnode", php_domxmlnode_class_functions, NULL, NULL, NULL);
domxmlnode_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomDocument", php_domxmldoc_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domdocument", php_domxmldoc_class_functions, NULL, NULL, NULL);
domxmldoc_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomParser", php_domxmlparser_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domparser", php_domxmlparser_class_functions, NULL, NULL, NULL);
domxmlparser_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomDocumentType", php_domxmldoctype_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domdocumenttype", php_domxmldoctype_class_functions, NULL, NULL, NULL);
domxmldoctype_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "Dtd", php_domxmldtd_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "dtd", php_domxmldtd_class_functions, NULL, NULL, NULL);
domxmldtd_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomElement", php_domxmlelement_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domelement", php_domxmlelement_class_functions, NULL, NULL, NULL);
domxmlelement_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomAttribute", php_domxmlattr_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domattribute", php_domxmlattr_class_functions, NULL, NULL, NULL);
domxmlattr_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomCData", php_domxmlcdata_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domcdata", php_domxmlcdata_class_functions, NULL, NULL, NULL);
domxmlcdata_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomText", php_domxmltext_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domtext", php_domxmltext_class_functions, NULL, NULL, NULL);
domxmltext_class_entry = zend_register_internal_class_ex(&ce, domxmlcdata_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomComment", php_domxmlcomment_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domcomment", php_domxmlcomment_class_functions, NULL, NULL, NULL);
domxmlcomment_class_entry = zend_register_internal_class_ex(&ce, domxmlcdata_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomProcessingInstruction", php_domxmlpi_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domprocessinginstruction", php_domxmlpi_class_functions, NULL, NULL, NULL);
domxmlpi_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNotation", php_domxmlnotation_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domnotation", php_domxmlnotation_class_functions, NULL, NULL, NULL);
domxmlnotation_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomEntity", php_domxmlentity_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domentity", php_domxmlentity_class_functions, NULL, NULL, NULL);
domxmlentity_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomEntityReference", php_domxmlentityref_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domentityreference", php_domxmlentityref_class_functions, NULL, NULL, NULL);
domxmlentityref_class_entry = zend_register_internal_class_ex(&ce, domxmlnode_class_entry, NULL TSRMLS_CC);
- INIT_OVERLOADED_CLASS_ENTRY(ce, "DomNamespace", php_domxmlns_class_functions, NULL, NULL, NULL);
+ INIT_OVERLOADED_CLASS_ENTRY(ce, "domnamespace", php_domxmlns_class_functions, NULL, NULL, NULL);
domxmlns_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
#if defined(LIBXML_XPATH_ENABLED)
/* don't know why that line was commented out in the previous version, so i left it (cmv) */
php_info_print_table_start();
php_info_print_table_row(2, "DOM/XML", "enabled");
- php_info_print_table_row(2, "DOM/XML API Version", DOMXML_API_VERSION);
+ php_info_print_table_row(2, "DOM/XML API Version", DOMXML_API_VERSION);
php_info_print_table_row(2, "libxml Version", LIBXML_DOTTED_VERSION);
#if defined(LIBXML_HTML_ENABLED)
php_info_print_table_row(2, "HTML Support", "enabled");
/* {{{ Methods of Class DomAttribute */
/* {{{ proto array domxml_attr_name(void)
- Returns list of attribute names
- Notice: domxml_node_name() does exactly the same for attribute-nodes,
+ Returns list of attribute names
+ Notice: domxml_node_name() does exactly the same for attribute-nodes,
is this function here still needed, or would an alias be enough?
*/
PHP_FUNCTION(domxml_attr_name)
Creates node */
PHP_FUNCTION(domxml_node)
{
- zval *rv;
+ zval *rv = NULL;
xmlNode *node;
int ret, name_len;
char *name;
RETURN_FALSE;
}
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlnode_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Clones a node */
PHP_FUNCTION(domxml_clone_node)
{
- zval *rv;
+ zval *rv = NULL;
zval *id;
xmlNode *n, *node;
int ret, recursive = 0;;
Returns first child from list of children */
PHP_FUNCTION(domxml_node_first_child)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep, *first;
int ret;
Returns last child from list of children */
PHP_FUNCTION(domxml_node_last_child)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep, *last;
int ret;
Returns next child from list of children */
PHP_FUNCTION(domxml_node_next_sibling)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep, *first;
int ret;
Returns previous child from list of children */
PHP_FUNCTION(domxml_node_previous_sibling)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep, *first;
int ret;
Returns document this node belongs to */
PHP_FUNCTION(domxml_node_owner_document)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep;
xmlDocPtr docp;
int ret;
Returns parent of node */
PHP_FUNCTION(domxml_node_parent)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep, *last;
int ret;
while (last) {
zval *child;
- child = php_domobject_new(last, &ret TSRMLS_CC);
+ child = php_domobject_new(last, &ret, NULL TSRMLS_CC);
add_next_index_zval(return_value, child);
last = last->next;
}
DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep);
xmlUnlinkNode(nodep);
- /* This causes a Segmentation Fault for some reason. Removing
+ /* This causes a Segmentation Fault for some reason. Removing
it allows the user to re-add the node at some other time, in
addition to fixing the segfault. Node will be freed at
shutdown. */
}
/* }}} */
-
/* {{{ proto object domxml_node_replace_node(object domnode)
Replaces one node with another node */
PHP_FUNCTION(domxml_node_replace_node)
{
- zval *id, *rv, *node;
+ zval *id, *rv = NULL, *node;
xmlNodePtr repnode, nodep, new_repnode;
int ret;
Adds node to list of children */
PHP_FUNCTION(domxml_node_append_child)
{
- zval *id, *rv, *node;
+ zval *id, *rv = NULL, *node;
xmlNodePtr child, nodep, new_child;
int ret;
Adds node to list of siblings */
PHP_FUNCTION(domxml_node_append_sibling)
{
- zval *id, *rv, *node;
+ zval *id, *rv = NULL, *node;
xmlNodePtr child, nodep, new_child;
int ret;
Adds node in list of nodes before given node */
PHP_FUNCTION(domxml_node_insert_before)
{
- zval *id, *rv, *node, *ref;
+ zval *id, *rv = NULL, *node, *ref;
xmlNodePtr child, new_child, nodep, refp;
int ret;
while (children) {
if (children == child) {
- zval *rv;
+ zval *rv = NULL;
xmlUnlinkNode(child);
DOMXML_RET_OBJ(rv, child, &ret);
return;
* a child, then do the replacement
*/
if(foundoldchild && !foundnewchild) {
- zval *rv;
+ zval *rv = NULL;
xmlNodePtr node;
node = xmlReplaceNode(oldchild, newchild);
DOMXML_RET_OBJ(rv, oldchild, &ret);
* the new node are identical.
*/
if(foundnewchild) {
- zval *rv;
+ zval *rv = NULL;
DOMXML_RET_OBJ(rv, newchild, &ret);
return;
} else {
Adds child node to parent node */
PHP_FUNCTION(domxml_node_new_child)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNodePtr child, nodep;
int ret, name_len, content_len;
char *name, *content = NULL;
/* FIXME: Actually the property 'content' of the node has to be updated
as well. Since 'content' should disappear sooner or later and being
replaces by a function 'content()' I skip this for now
- */
+ */
RETURN_TRUE;
}
/* }}} */
/* {{{ proto string domxml_node_get_content()
Gets content of a node.
-
+
"Read the value of a node, this can be either the text carried directly by
this node if it's a TEXT node or the aggregate string of the values carried by
this node child's (TEXT and ENTITY_REF). Entity references are substituted."
if (!mem) {
RETURN_FALSE;
}
-
+
RETVAL_STRING(mem,1);
xmlFree(mem);
}
Constructor of DomElement */
PHP_FUNCTION(domxml_element)
{
- zval *rv;
+ zval *rv = NULL;
xmlNode *node;
int ret, name_len;
char *name;
Sets value of given attribute */
PHP_FUNCTION(domxml_elem_set_attribute)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep;
xmlAttr *attr;
int ret, name_len, value_len;
xmlAttr *attrp;
int name_len;
char *name;
-
+
DOMXML_PARAM_TWO(nodep, id, le_domxmlelementp, "s", &name, &name_len);
attrp = xmlHasProp(nodep,name);
if (attrp == NULL) {
Returns value of given attribute */
PHP_FUNCTION(domxml_elem_get_attribute_node)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *nodep;
xmlAttr *attrp;
int name_len, ret;
Sets value of given attribute */
PHP_FUNCTION(domxml_elem_set_attribute_node)
{
- zval *id, *arg1, *rv;
+ zval *id, *arg1, *rv = NULL;
xmlNode *nodep;
xmlAttr *attrp, *newattrp;
int ret;
contextnodep = NULL;
DOMXML_PARAM_FOUR(docp, id, le_domxmldocp, "s|oo", &name, &name_len,&ctxpin,&contextnodep);
-
+
/* if no xpath_context was submitted, create a new one */
if (ctxpin == NULL) {
ctxp = xmlXPathNewContext(docp);
int retnode;
/* construct a node object */
- child = php_domobject_new(node, &retnode TSRMLS_CC);
+ child = php_domobject_new(node, &retnode, NULL TSRMLS_CC);
zend_hash_next_index_insert(Z_ARRVAL_P(rv), &child, sizeof(zval *), NULL);
}
ids = (xmlHashTable *) docp->ids;
if(ids) {
- iter.elementId = (xmlChar *)
+ iter.elementId = (xmlChar *)
iter.element = NULL;
- xmlHashScan(ids, idsHashScanner, &iter);
- rv = php_domobject_new(iter.element, &retnode TSRMLS_CC);
+ xmlHashScan(ids, (void *)idsHashScanner, &iter);
+ rv = php_domobject_new(iter.element, &retnode, NULL TSRMLS_CC);
SEPARATE_ZVAL(&rv);
*return_value = *rv;
FREE_ZVAL(rv);
DOMXML_PARAM_TWO(nodep, id, le_domxmlelementp, "s", &name, &name_len);
MAKE_STD_ZVAL(rv);
-
+
if(array_init(rv) != SUCCESS) {
php_error(E_WARNING, "%s(): cannot create required array", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
zval *child;
int retnode;
- child = php_domobject_new(node, &retnode TSRMLS_CC);
+ child = php_domobject_new(node, &retnode, NULL TSRMLS_CC);
zend_hash_next_index_insert(Z_ARRVAL_P(rv), &child, sizeof(zval *), NULL);
}
}
while (last) {
zval *child;
- child = php_domobject_new(last, &ret TSRMLS_CC);
+ child = php_domobject_new(last, &ret, NULL TSRMLS_CC);
add_next_index_zval(return_value, child);
last = last->next;
}
while (last) {
zval *child;
- child = php_domobject_new(last, &ret TSRMLS_CC);
+ child = php_domobject_new(last, &ret, NULL TSRMLS_CC);
add_next_index_zval(return_value, child);
last = last->next;
}
Returns DomDocumentType */
PHP_FUNCTION(domxml_doc_doctype)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlDtdPtr dtd;
xmlDocPtr docp;
int ret;
Creates new element node */
PHP_FUNCTION(domxml_doc_create_element)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, name_len;
char *name;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmlelement_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlelement_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Creates new text node */
PHP_FUNCTION(domxml_doc_create_text_node)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, content_len;
char *content;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmltext_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &content, &content_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmltext_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Creates new comment node */
PHP_FUNCTION(domxml_doc_create_comment)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, content_len;
char *content;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmlcomment_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &content, &content_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlcomment_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Creates new attribute node */
PHP_FUNCTION(domxml_doc_create_attribute)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlAttrPtr node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, name_len, value_len;
char *name, *value;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmlattr_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &value, &value_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, (xmlNodePtr) node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlattr_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), (xmlNodePtr) node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, (xmlNodePtr) node, &ret);
+ }
}
/* }}} */
Creates new cdata node */
PHP_FUNCTION(domxml_doc_create_cdata_section)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, content_len;
char *content;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmlcdata_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &content, &content_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlcdata_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Creates new cdata node */
PHP_FUNCTION(domxml_doc_create_entity_reference)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, name_len;
char *name;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmlentityref_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlentityref_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Creates new processing_instruction node */
PHP_FUNCTION(domxml_doc_create_processing_instruction)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlNode *node;
- xmlDocPtr docp;
+ xmlDocPtr docp = NULL;
int ret, name_len, content_len;
char *name, *content;
- DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ if(!DOMXML_IS_TYPE(getThis(), domxmlpi_class_entry)) {
+ DOMXML_GET_THIS_OBJ(docp, id, le_domxmldocp);
+ }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &content, &content_len) == FAILURE) {
return;
}
node->doc = docp;
- DOMXML_RET_OBJ(rv, node, &ret);
+ if(DOMXML_IS_TYPE(getThis(), domxmlpi_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), node, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, node, &ret);
+ }
}
/* }}} */
Creates new element node */
PHP_FUNCTION(domxml_doc_imported_node)
{
- zval *arg1, *id, *rv;
+ zval *arg1, *id, *rv = NULL;
xmlNodePtr node, srcnode;
xmlDocPtr docp;
int ret, recursive = 0;
Returns DTD of document */
PHP_FUNCTION(domxml_intdtd)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlDoc *docp;
xmlDtd *dtd;
int ret;
int size;
int encoding_len = 0;
char *encoding;
-
+
DOMXML_PARAM_THREE(docp, id, le_domxmldocp, "|ls", &format, &encoding, &encoding_len);
if (format) {
xmlDocDumpFormatMemoryEnc(docp, &mem, &size, encoding, format);
} else {
xmlDocDumpFormatMemory(docp, &mem, &size, format);
- }
+ }
} else {
if (encoding_len) {
xmlDocDumpMemoryEnc(docp, &mem, &size, encoding);
xmlBufferPtr buf;
int level = 0;
int format = 0;
-
+
DOMXML_PARAM_THREE(docp, id, le_domxmldocp, "o|ll", &nodep, &format, &level);
-
+
DOMXML_GET_OBJ(elementp, nodep, le_domxmlnodep);
if (Z_TYPE_P(elementp) == XML_DOCUMENT_NODE || Z_TYPE_P(elementp) == XML_HTML_DOCUMENT_NODE ) {
php_error(E_WARNING, "%s(): cannot dump element with a document node", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
-
+
buf = xmlBufferCreate();
if (!buf) {
php_error(E_WARNING, "%s(): could fetch buffer", get_active_function_name(TSRMLS_C));
RETURN_FALSE;
}
-
+
xmlNodeDump(buf, docp, elementp, level, format);
mem = (xmlChar*) xmlBufferContent(buf);
RETURN_FALSE;
}
RETVAL_STRING(mem, 1);
+
xmlBufferFree(buf);
}
xmlNode *nodep;
TSRMLS_FETCH();
-
+
nodep = ((xmlNode *)((xmlID *)payload)->attr)->parent;
- child = php_domobject_new(nodep, &ret TSRMLS_CC);
+ child = php_domobject_new(nodep, &ret, NULL TSRMLS_CC);
add_next_index_zval(return_value, child);
}
RETURN_FALSE;
}
- xmlHashScan(ids, idsHashScanner2, return_value);
+ xmlHashScan(ids, (void *)idsHashScanner2, return_value);
} else {
RETURN_FALSE;
}
Creates DOM object of XML document */
PHP_FUNCTION(xmldoc)
{
- zval *rv;
+ zval *rv = NULL;
xmlDoc *docp;
int ret;
char *buffer;
xmlParseDTD(dtd->ExternalID, dtd->SystemID);
}
*/
- DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
+
+ if(DOMXML_IS_TYPE(getThis(), domxmldoc_class_entry)) {
+ DOMXML_DOMOBJ_NEW(getThis(), (xmlNodePtr) docp, &ret);
+ } else {
+ DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
+ }
}
/* }}} */
Creates DOM object of XML document in file */
PHP_FUNCTION(xmldocfile)
{
- zval *rv;
+ zval *rv = NULL;
xmlDoc *docp;
int ret, file_len;
char *file;
DOMXML_RET_OBJ(rv, (xmlNodePtr) docp, &ret);
- add_property_resource(return_value, "doc", ret);
+/* add_property_resource(return_value, "doc", ret);
if (docp->name)
add_property_stringl(return_value, "name", (char *) docp->name, strlen(docp->name), 1);
if (docp->URL)
add_property_long(return_value, "type", Z_TYPE_P(docp));
add_property_long(return_value, "compression", docp->compression);
add_property_long(return_value, "charset", docp->charset);
- zend_list_addref(ret);
+ zend_list_addref(ret);*/
}
/* }}} */
Creates DOM object of HTML document */
PHP_FUNCTION(html_doc)
{
- zval *rv;
+ zval *rv = NULL;
xmlDoc *docp;
int ret;
char *buffer;
Creates DOM object of HTML document in file */
PHP_FUNCTION(html_doc_file)
{
- zval *rv;
+ zval *rv = NULL;
xmlDoc *docp;
int ret, file_len;
char *file;
}
/* }}} */
-/* {{{ proto object domxml_doc_add_root(string name)
+/* {{{ proto object domxml_add_root(string name)
Adds root node to document */
PHP_FUNCTION(domxml_doc_add_root)
{
- zval *id, *rv;
+ zval *id, *rv = NULL;
xmlDoc *docp;
xmlNode *nodep;
int ret, name_len;
Creates new xmldoc */
PHP_FUNCTION(domxml_new_xmldoc)
{
- zval *rv;
+ zval *rv = NULL;
xmlDoc *docp;
int ret, buf_len;
char *buf;
}
/* parserp->loadsubset = XML_DETECT_IDS; */
- rv = php_xmlparser_new(parserp, &ret TSRMLS_CC);
+ rv = php_xmlparser_new(parserp, &ret TSRMLS_CC);
DOMXML_RET_ZVAL(rv);
}
/* }}} */
Ends parsing and returns DomDocument*/
PHP_FUNCTION(domxml_parser_end)
{
- zval *id,*rv;
+ zval *id,*rv = NULL;
xmlParserCtxtPtr parserp;
char *chunk = NULL;
int chunk_len = 0, error;
DOMXML_PARAM_TWO(parserp, id, le_domxmlparserp,"|s", &chunk, &chunk_len);
error = xmlParseChunk(parserp, chunk, chunk_len, 1);
if (error != 0) {
- php_error(E_ERROR,"error: %d",error);
+ php_error(E_ERROR,"error: %d",error);
RETURN_FALSE;
}
if (parserp->myDoc != NULL) {
zval *pattr;
int ret;
- pattr = php_domobject_new((xmlNodePtr) ns, &ret TSRMLS_CC);
+ pattr = php_domobject_new((xmlNodePtr) ns, &ret, NULL TSRMLS_CC);
SEPARATE_ZVAL(&pattr);
/* if(!ret) { */
zval *pattr;
int ret;
- pattr = php_domobject_new((xmlNodePtr) attr, &ret TSRMLS_CC);
+ pattr = php_domobject_new((xmlNodePtr) attr, &ret, NULL TSRMLS_CC);
/** XXX FIXME XXX */
/* if(0 <= (n = node_children(&children, attr->children TSRMLS_CC))) {
zend_hash_update(Z_OBJPROP_P(value), "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL);
zval *child;
int ret;
- if (NULL != (child = php_domobject_new(last, &ret TSRMLS_CC))) {
+ if (NULL != (child = php_domobject_new(last, &ret, NULL TSRMLS_CC))) {
zend_hash_next_index_insert(Z_ARRVAL_PP(children), &child, sizeof(zval *), NULL);
/* Get the namespace of the current node and add it as a property */
Creates a tree of PHP objects from an XML document */
PHP_FUNCTION(domxml_xmltree)
{
- zval *children, *rv;
+ zval *children, *rv = NULL;
xmlDoc *docp;
xmlNode *root;
int ret, buf_len;
int retnode;
/* construct a node object */
- child = php_domobject_new(node, &retnode TSRMLS_CC);
+ child = php_domobject_new(node, &retnode, NULL TSRMLS_CC);
zend_hash_next_index_insert(Z_ARRVAL_P(arr), &child, sizeof(zval *), NULL);
}
zend_hash_update(Z_OBJPROP_P(rv), "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL);
}
/* }}} */
-
-
#if HAVE_DOMXSLT
static zval *php_xsltstylesheet_new(xsltStylesheetPtr obj, int *found TSRMLS_DC)
{
projects / php / commitdiff