cvs: /php4/ext/domxml domxml.c /php4/tests testdom testhyperwave

steinm Fri Mar 3 04:38:20 2000 EDT Modified files: /php4/ext/domxml domxml.c /php4/tests testdom testhyperwave Log: - tiny changes to testscript and domxml Index: php4/ext/domxml/domxml.c diff -u php4/ext/domxml/domxml.c:1.26 php4/ext/domxml/domxml.c:1.27 --- php4/ext/domxml/domxml.c:1.26 Fri Mar 3 00:44:25 2000 +++ php4/ext/domxml/domxml.c Fri Mar 3 04:38:19 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domxml.c,v 1.26 2000/03/03 08:44:25 steinm Exp $ */ +/* $Id: domxml.c,v 1.27 2000/03/03 12:38:19 steinm Exp $ */ #include "php.h" @@ -1317,8 +1317,9 @@ if((*keydata)->type == IS_OBJECT) { if (zend_hash_find((*keydata)->value.obj.properties, "type", sizeof("type"), (void **)&prop) == SUCCESS) { if((*prop)->value.lval == XML_ELEMENT_NODE) { - root = *keydata; - zend_hash_update(return_value->value.obj.properties, "root", strlen("root")+1, (void *) &root, sizeof(zval *), NULL); + zend_hash_update(return_value->value.obj.properties, "root", strlen("root")+1, (void *) &(*keydata), sizeof(zval *), NULL); +// (*keydata)->is_ref = 1; +// (*keydata)->refcount = 2; } } } Index: php4/tests/testdom diff -u php4/tests/testdom:1.14 php4/tests/testdom:1.15 --- php4/tests/testdom:1.14 Thu Mar 2 08:58:07 2000 +++ php4/tests/testdom Fri Mar 3 04:38:19 2000 @@ -82,7 +82,7 @@ /* This one creates a dom tree made of php objects */ echo "Test 2: creating a tree with php objects\n"; $dom = xmltree($xmlstr); -//$dom->root->name = "section"; +$dom->root->name = "section"; var_dump($dom); echo $dom->root->name; echo "\n"; Index: php4/tests/testhyperwave diff -u php4/tests/testhyperwave:1.1 php4/tests/testhyperwave:1.2 --- php4/tests/testhyperwave:1.1 Mon Nov 22 08:09:07 1999 +++ php4/tests/testhyperwave Fri Mar 3 04:38:20 2000 @@ -1,10 +1,10 @@ <? - $id = 190867; // A plain/text document + $id = 187852; // A plain/text document $collid = 169828; // A collection $query = "Name=m*"; // Search query for test_9 $host = "gehtnix"; $username = "steinm"; - $password = "akli9132"; + $password = ""; $connect = hw_connect($host, 418, $username, $password); if(hw_error($connect)) { @@ -14,14 +14,14 @@ // Set all test to 'yes' if they shall be executed $test_1 = "yes"; // Get the text document with id $id and output it - $test_2 = "yes"; // Check if id $id is in $collid - $test_3 = "yes"; // Convert object record to object array and back - $test_4 = "yes"; // Get object record of object with id $id - $test_5 = "yes"; // List children of $collid - $test_6 = "yes"; // List parents of $id - $test_7 = "yes"; // Insert a new text document - $test_8 = "yes"; // Remove the just inserted text document - $test_9 = "yes"; // Searching for objects with Name $query + $test_2 = "no"; // Check if id $id is in $collid + $test_3 = "no"; // Convert object record to object array and back + $test_4 = "no"; // Get object record of object with id $id + $test_5 = "no"; // List children of $collid + $test_6 = "no"; // List parents of $id + $test_7 = "no"; // Insert a new text document + $test_8 = "no"; // Remove the just inserted text document + $test_9 = "no"; // Searching for objects with Name $query /* Lists an object array */