rrichards Mon Jun 16 15:45:06 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/xmlreader/tests expand.phpt
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
MFH: add parameter allowing node to be exported into existing Document
context [DOC]
add test
fix warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.9.2.4&r2=1.13.2.14.2.9.2.5&diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.4
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.5
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.9.2.4 Tue Mar 18
14:48:09 2008
+++ php-src/ext/xmlreader/php_xmlreader.c Mon Jun 16 15:45:06 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.14.2.9.2.4 2008/03/18 14:48:09 tony2001 Exp $
*/
+/* $Id: php_xmlreader.c,v 1.13.2.14.2.9.2.5 2008/06/16 15:45:06 rrichards Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -92,7 +92,7 @@
switch (hnd->type) {
case IS_STRING:
if (retchar) {
- ZVAL_STRING(*retval, (xmlChar *) retchar, 1);
+ ZVAL_STRING(*retval, (char *) retchar, 1);
} else {
ZVAL_EMPTY_STRING(*retval);
}
@@ -233,8 +233,8 @@
int isFileUri = 0;
uri = xmlCreateURI();
- escsource = xmlURIEscapeStr(source, ":");
- xmlParseURIReference(uri, escsource);
+ escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *)":");
+ xmlParseURIReference(uri, (const char *)escsource);
xmlFree(escsource);
if (uri->scheme != NULL) {
@@ -430,7 +430,7 @@
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
- retchar = internal_function(intern->ptr, name);
+ retchar = (char *)internal_function(intern->ptr, (const
unsigned char *)name);
}
if (retchar) {
RETVAL_STRING(retchar, 1);
@@ -473,7 +473,7 @@
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
- retchar = internal_function(intern->ptr);
+ retchar = (char *)internal_function(intern->ptr);
}
if (retchar) {
RETVAL_STRING(retchar, 1);
@@ -583,7 +583,7 @@
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
- retchar = xmlTextReaderGetAttributeNo(intern->ptr,attr_pos);
+ retchar = (char *)xmlTextReaderGetAttributeNo(intern->ptr,
attr_pos);
}
if (retchar) {
RETVAL_STRING(retchar, 1);
@@ -617,7 +617,7 @@
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
- retchar = xmlTextReaderGetAttributeNs(intern->ptr, name,
ns_uri);
+ retchar = (char *)xmlTextReaderGetAttributeNs(intern->ptr,
(xmlChar *)name, (xmlChar *)ns_uri);
}
if (retchar) {
RETVAL_STRING(retchar, 1);
@@ -697,7 +697,7 @@
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
- retval = xmlTextReaderMoveToAttribute(intern->ptr, name);
+ retval = xmlTextReaderMoveToAttribute(intern->ptr, (xmlChar
*)name);
if (retval == 1) {
RETURN_TRUE;
}
@@ -758,7 +758,7 @@
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
- retval = xmlTextReaderMoveToAttributeNs(intern->ptr, name,
ns_uri);
+ retval = xmlTextReaderMoveToAttributeNs(intern->ptr, (xmlChar
*)name, (xmlChar *)ns_uri);
if (retval == 1) {
RETURN_TRUE;
}
@@ -841,7 +841,7 @@
#endif
retval = xmlTextReaderNext(intern->ptr);
while (name != NULL && retval == 1) {
- if
(xmlStrEqual(xmlTextReaderConstLocalName(intern->ptr), name)) {
+ if
(xmlStrEqual(xmlTextReaderConstLocalName(intern->ptr), (xmlChar *)name)) {
RETURN_TRUE;
}
retval = xmlTextReaderNext(intern->ptr);
@@ -1126,12 +1126,22 @@
PHP_METHOD(xmlreader, expand)
{
#ifdef HAVE_DOM
- zval *id, *rv = NULL;
+ zval *id, *rv = NULL, *basenode = NULL;
int ret;
xmlreader_object *intern;
xmlNode *node, *nodec;
+ xmlDocPtr docp = NULL;
+ php_libxml_node_object *domobj = NULL;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O|O!", &id, xmlreader_class_entry, &basenode, dom_node_class_entry) ==
FAILURE) {
+ return;
+ }
+
+ if (basenode != NULL) {
+ NODE_GET_OBJ(node, basenode, xmlNodePtr, domobj);
+ docp = node->doc;
+ }
- id = getThis();
intern = (xmlreader_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern && intern->ptr) {
@@ -1141,12 +1151,12 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error
Occured while expanding ");
RETURN_FALSE;
} else {
- nodec = xmlCopyNode(node, 1);
+ nodec = xmlDocCopyNode(node, docp, 1);
if (nodec == NULL) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"Cannot expand this node type");
RETURN_FALSE;
} else {
- DOM_RET_OBJ(rv, nodec, &ret, NULL);
+ DOM_RET_OBJ(rv, nodec, &ret, (dom_object
*)domobj);
}
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/expand.phpt?view=markup&rev=1.1
Index: php-src/ext/xmlreader/tests/expand.phpt
+++ php-src/ext/xmlreader/tests/expand.phpt
--TEST--
XMLReader: Expand into existing DOM documet
--SKIPIF--
<?php if (!extension_loaded("xmlreader")) print "skip";
if (!extension_loaded("dom")) print "skip";
$reader = new XMLReader();
if (!method_exists($reader, 'expand')) print "skip";
?>
--FILE--
<?php
$basexml = '<?xml version="1.0" encoding="UTF-8"?>
<books><book>base book</book></books>';
$xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
<books><book>new book</book></books>';
$dom = new DOMDocument();
$dom->loadXML($basexml);
$reader = new XMLReader();
$reader->XML($xmlstring);
while ($reader->read()) {
if ($reader->localName == "book") {
$node = $reader->expand($dom);
if ($node->ownerDocument) {
echo $node->ownerDocument->documentElement->firstChild->textContent
. "\n";
}
break;
}
}
$reader->close();
?>
===DONE===
--EXPECT--
base book
===DONE===
