Index: ext/domxml/php_domxml.c =================================================================== RCS file: /repository/php4/ext/domxml/php_domxml.c,v retrieving revision 1.227 diff -u -r1.227 php_domxml.c --- ext/domxml/php_domxml.c 9 Dec 2002 08:14:15 -0000 1.227 +++ ext/domxml/php_domxml.c 6 Jan 2003 09:40:43 -0000 @@ -2400,9 +2426,40 @@ DOMXML_GET_OBJ(child, node, le_domxmlnodep); + new_child = NULL; + if (ref != NULL) { DOMXML_GET_OBJ(refp, ref, le_domxmlnodep); - new_child = xmlAddPrevSibling(refp, child); + + /* + * The following code is from libxml2/tree.c + * libxml does free textnodes, if there are adjacent TEXT nodes + * This is bad behaviour for domxml, since then we have have reference + * to undefined nodes. The idea here is, that we do this text comparison + * by ourself and not free the nodes. and only if libxml2 won't do any harm + * call the function from libxml2. + * The code is exactly the same as in libxml2, only xmlFreeNode was taken away. + */ + + if (child->type == XML_TEXT_NODE) { + if (refp->type == XML_TEXT_NODE) { + xmlChar *tmp; + + tmp = xmlStrdup(child->content); + tmp = xmlStrcat(tmp, refp->content); + xmlNodeSetContent(refp, tmp); + xmlFree(tmp); + new_child = refp; + } + if ((refp->prev != NULL) && (refp->prev->type == XML_TEXT_NODE) + && (refp->name == refp->prev->name)) { + xmlNodeAddContent(refp->prev, child->content); + new_child = refp->prev; + } + } + + if (new_child == NULL) + new_child = xmlAddPrevSibling(refp, child); } else { /* first unlink node, if child is already a child of parent for some strange reason, this is needed Index: ext/domxml/php_domxml.h =================================================================== RCS file: /repository/php4/ext/domxml/php_domxml.h,v retrieving revision 1.73 diff -u -r1.73 php_domxml.h --- ext/domxml/php_domxml.h 29 Nov 2002 11:22:06 -0000 1.73 +++ ext/domxml/php_domxml.h 6 Jan 2003 09:40:43 -0000 @@ -153,6 +153,7 @@ PHP_FUNCTION(domxml_node_get_content); PHP_FUNCTION(domxml_node_text_concat); PHP_FUNCTION(domxml_node_set_name); +PHP_FUNCTION(domxml_node_get_path); PHP_FUNCTION(domxml_node_name); PHP_FUNCTION(domxml_node_type); PHP_FUNCTION(domxml_node_value);