dmitry Tue Feb 17 10:10:18 2004 EDT
Modified files:
/php-src/ext/soap php_encoding.c php_schema.c php_sdl.c soap.c
Log:
support for XMLSchema <element> nillable attribute
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.59&r2=1.60&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.59 php-src/ext/soap/php_encoding.c:1.60
--- php-src/ext/soap/php_encoding.c:1.59 Tue Feb 17 03:18:53 2004
+++ php-src/ext/soap/php_encoding.c Tue Feb 17 10:10:16 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.59 2004/02/17 08:18:53 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.60 2004/02/17 15:10:16 dmitry Exp $ */
#include <time.h>
@@ -108,7 +108,7 @@
if (!zval || Z_TYPE_P(zval) == IS_NULL) { \
if (style == SOAP_ENCODED) {\
xmlSetProp(xml, "xsi:nil", "1"); \
- }\
+ } \
return xml; \
} \
}
@@ -979,12 +979,34 @@
zend_hash_internal_pointer_reset(ht);
while
(zend_hash_get_current_data(ht,(void**)&val) == SUCCESS) {
- property = master_to_xml(enc, *val,
style, node);
+ if (Z_TYPE_PP(val) == IS_NULL &&
model->u.element->nillable) {
+ property =
xmlNewNode(NULL,"BOGUS");
+ xmlAddChild(node, property);
+ if (style == SOAP_ENCODED) {
+ xmlSetProp(property,
"xsi:nil", "1");
+ } else {
+ xmlNsPtr xsi =
encode_add_ns(property,XSI_NAMESPACE);
+ xmlSetNsProp(property,
xsi, "nil", "1");
+ }
+ } else {
+ property = master_to_xml(enc,
*val, style, node);
+ }
xmlNodeSetName(property,
model->u.element->name);
zend_hash_move_forward(ht);
}
} else {
- property = master_to_xml(enc, *data, style,
node);
+ if (Z_TYPE_PP(data) == IS_NULL &&
model->u.element->nillable) {
+ property = xmlNewNode(NULL,"BOGUS");
+ xmlAddChild(node, property);
+ if (style == SOAP_ENCODED) {
+ xmlSetProp(property,
"xsi:nil", "1");
+ } else {
+ xmlNsPtr xsi =
encode_add_ns(property,XSI_NAMESPACE);
+ xmlSetNsProp(property, xsi,
"nil", "1");
+ }
+ } else {
+ property = master_to_xml(enc, *data,
style, node);
+ }
xmlNodeSetName(property,
model->u.element->name);
}
return 1;
@@ -1149,7 +1171,19 @@
zend_hash_internal_pointer_reset(prop);
while (zend_hash_get_current_data(prop,(void**)&val)
== SUCCESS) {
- xmlNodePtr property =
master_to_xml(array_el->encode, *val, style, xmlParam);
+ xmlNodePtr property;
+ if (Z_TYPE_PP(val) == IS_NULL &&
array_el->nillable) {
+ property = xmlNewNode(NULL,"BOGUS");
+ xmlAddChild(xmlParam, property);
+ if (style == SOAP_ENCODED) {
+ xmlSetProp(property,
"xsi:nil", "1");
+ } else {
+ xmlNsPtr xsi =
encode_add_ns(property,XSI_NAMESPACE);
+ xmlSetNsProp(property, xsi,
"nil", "1");
+ }
+ } else {
+ property =
master_to_xml(array_el->encode, *val, style, xmlParam);
+ }
xmlNodeSetName(property, array_el->name);
zend_hash_move_forward(prop);
}
http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.c?r1=1.43&r2=1.44&ty=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.43 php-src/ext/soap/php_schema.c:1.44
--- php-src/ext/soap/php_schema.c:1.43 Fri Feb 13 10:19:09 2004
+++ php-src/ext/soap/php_schema.c Tue Feb 17 10:10:16 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_schema.c,v 1.43 2004/02/13 15:19:09 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.44 2004/02/17 15:10:16 dmitry Exp $ */
#include "php_soap.h"
#include "libxml/uri.h"
@@ -2135,6 +2135,9 @@
if (zend_hash_find(ctx->sdl->elements, type->ref,
strlen(type->ref)+1, (void**)&tmp) == SUCCESS) {
type->encode = (*tmp)->encode;
/* TODO: nillable */
+ if ((*tmp)->nillable) {
+ type->nillable = 1;
+ }
} else {
php_error(E_ERROR, "SOAP-ERROR: Parsing Schema:
unresolved element 'ref' attribute");
}
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.61&r2=1.62&ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.61 php-src/ext/soap/php_sdl.c:1.62
--- php-src/ext/soap/php_sdl.c:1.61 Tue Feb 17 04:23:28 2004
+++ php-src/ext/soap/php_sdl.c Tue Feb 17 10:10:16 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_sdl.c,v 1.61 2004/02/17 09:23:28 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.62 2004/02/17 15:10:16 dmitry Exp $ */
#include "php_soap.h"
#include "libxml/uri.h"
@@ -877,7 +877,7 @@
return ctx.sdl;
}
-#define WSDL_CACHE_VERSION 02
+#define WSDL_CACHE_VERSION 03
#define WSDL_CACHE_GET(ret,type,buf) memcpy(&ret,*buf,sizeof(type)); *buf +=
sizeof(type);
#define WSDL_CACHE_GET_INT(ret,buf) ret =
((int)(*buf)[0])|((int)(*buf)[1]<<8)|((int)(*buf)[2]<<16)|((int)(*buf)[3]<<24); *buf
+= 4;
@@ -992,14 +992,12 @@
case XSD_CONTENT_ALL:
case XSD_CONTENT_CHOICE:
WSDL_CACHE_GET_INT(i, in);
- if (i > 0) {
- model->u.content = emalloc(sizeof(HashTable));
- zend_hash_init(model->u.content, i, NULL,
delete_model, 0);
- while (i > 0) {
- sdlContentModelPtr x =
sdl_deserialize_model(types, elements, in);
-
zend_hash_next_index_insert(model->u.content,&x,sizeof(sdlContentModelPtr),NULL);
- i--;
- }
+ model->u.content = emalloc(sizeof(HashTable));
+ zend_hash_init(model->u.content, i, NULL, delete_model, 0);
+ while (i > 0) {
+ sdlContentModelPtr x = sdl_deserialize_model(types,
elements, in);
+
zend_hash_next_index_insert(model->u.content,&x,sizeof(sdlContentModelPtr),NULL);
+ i--;
}
break;
case XSD_CONTENT_GROUP_REF:
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.86&r2=1.87&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.86 php-src/ext/soap/soap.c:1.87
--- php-src/ext/soap/soap.c:1.86 Tue Feb 17 03:18:53 2004
+++ php-src/ext/soap/soap.c Tue Feb 17 10:10:16 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.86 2004/02/17 08:18:53 dmitry Exp $ */
+/* $Id: soap.c,v 1.87 2004/02/17 15:10:16 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -387,6 +387,7 @@
/* hash by namespace */
zend_hash_add(&soap_globals->defEncNs, XSD_1999_NAMESPACE,
sizeof(XSD_1999_NAMESPACE), XSD_NS_PREFIX, sizeof(XSD_NS_PREFIX), NULL);
zend_hash_add(&soap_globals->defEncNs, XSD_NAMESPACE, sizeof(XSD_NAMESPACE),
XSD_NS_PREFIX, sizeof(XSD_NS_PREFIX), NULL);
+ zend_hash_add(&soap_globals->defEncNs, XSI_NAMESPACE, sizeof(XSI_NAMESPACE),
XSI_NS_PREFIX, sizeof(XSI_NS_PREFIX), NULL);
zend_hash_add(&soap_globals->defEncNs, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE), SOAP_1_1_ENC_NS_PREFIX,
sizeof(SOAP_1_1_ENC_NS_PREFIX), NULL);
zend_hash_add(&soap_globals->defEncNs, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE), SOAP_1_2_ENC_NS_PREFIX,
sizeof(SOAP_1_2_ENC_NS_PREFIX), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
