cvs: php4 /ext/domxml php_domxml.c
| From: | Christian Stocker | Date: | Wed, 14 Aug 2002 09:07:34 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13344@lists.php.net to get a copy of this message | ||
chregu Wed Aug 14 05:07:34 2002 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
fix for bug #18196
@ - DomElement->node_name() takes optional boolean argument for retrieving
@ - full qualified name (ie namespace prefix) (chregu)
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.187 php4/ext/domxml/php_domxml.c:1.188
--- php4/ext/domxml/php_domxml.c:1.187 Wed Aug 14 04:27:36 2002
+++ php4/ext/domxml/php_domxml.c Wed Aug 14 05:07:34 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.187 2002/08/14 08:27:36 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.188 2002/08/14 09:07:34 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1884,15 +1884,23 @@
{
zval *id;
xmlNode *n;
+ int fullQName = 0;
const char *str = NULL;
- DOMXML_GET_THIS_OBJ(n, id, le_domxmlnodep);
-
- DOMXML_NO_ARGS();
+ DOMXML_PARAM_ONE(n, id, le_domxmlnodep,"|b",&fullQName);
switch (Z_TYPE_P(n)) {
case XML_ELEMENT_NODE:
- str = n->name;
+ if (fullQName && n->ns && n->ns->prefix) {
+ /* there is maybe a better way of doing this...*/
+ char *tmpstr;
+ tmpstr = (char*) emalloc((strlen(n->ns->prefix)+strlen(n->name)) * sizeof(char)) ;
+ sprintf(tmpstr,"%s:%s", (char*) n->ns->prefix, (char*) n->name);
+ str = strdup(tmpstr);
+ efree(tmpstr);
+ } else {
+ str = n->name;
+ }
break;
case XML_TEXT_NODE: