You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/01/11 12:07:18 UTC
svn commit: r368007 - in /webservices/axis2/trunk/c/modules/xml: parser/
parser/libxml2/ soap/ soap/test/
Author: nandika
Date: Wed Jan 11 03:07:02 2006
New Revision: 368007
URL: http://svn.apache.org/viewcvs?rev=368007&view=rev
Log:
get_char_set_encoding() added to xml_reader.h
Added:
webservices/axis2/trunk/c/modules/xml/soap/soap11_builder_helper.c
- copied unchanged from r367990, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap11_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
- copied unchanged from r367990, webservices/axis2/trunk/c/modules/xml/soap/axis2_soap12_builder_helper.c
Removed:
webservices/axis2/trunk/c/modules/xml/soap/axis2_soap11_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/axis2_soap12_builder_helper.c
webservices/axis2/trunk/c/modules/xml/soap/test/
Modified:
webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h
webservices/axis2/trunk/c/modules/xml/parser/libxml2/axis2_libxml2_reader_wrapper.c
webservices/axis2/trunk/c/modules/xml/soap/soap_model_builder.c
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h?rev=368007&r1=368006&r2=368007&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_reader.h Wed Jan 11 03:07:02 2006
@@ -254,7 +254,11 @@
*/
axis2_status_t (AXIS2_CALL *xml_free)(axis2_xml_reader_t *parser,
axis2_env_t **env,
- void *data);
+ void *data);
+
+ axis2_char_t* (AXIS2_CALL *get_char_set_encoding)
+ (axis2_xml_reader_t *parser,
+ axis2_env_t **env);
};
/**
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/axis2_libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/axis2_libxml2_reader_wrapper.c?rev=368007&r1=368006&r2=368007&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/axis2_libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/axis2_libxml2_reader_wrapper.c Wed Jan 11 03:07:02 2006
@@ -97,6 +97,10 @@
axis2_libxml2_reader_wrapper_xml_free(axis2_xml_reader_t *parser,
axis2_env_t **env,
void *data);
+
+axis2_char_t* AXIS2_CALL
+axis2_libxml2_reader_get_char_set_encoding(axis2_xml_reader_t *parser,
+ axis2_env_t **env);
axis2_status_t axis2_libxml2_reader_wrapper_fill_maps(axis2_xml_reader_t *parser,
axis2_env_t **env);
@@ -269,7 +273,9 @@
axis2_libxml2_reader_wrapper_get_pi_data;
wrapper_impl->parser.ops->get_dtd =
- axis2_libxml2_reader_wrapper_get_dtd;
+ axis2_libxml2_reader_wrapper_get_dtd;
+ wrapper_impl->parser.ops->get_char_set_encoding =
+ axis2_libxml2_reader_get_char_set_encoding;
return &(wrapper_impl->parser);
}
@@ -363,7 +369,10 @@
axis2_libxml2_reader_wrapper_get_pi_data;
wrapper_impl->parser.ops->get_dtd =
- axis2_libxml2_reader_wrapper_get_dtd;
+ axis2_libxml2_reader_wrapper_get_dtd;
+
+ wrapper_impl->parser.ops->get_char_set_encoding =
+ axis2_libxml2_reader_get_char_set_encoding;
return &(wrapper_impl->parser);
}
@@ -687,6 +696,15 @@
return AXIS2_SUCCESS;
}
+axis2_char_t* AXIS2_CALL
+axis2_libxml2_reader_get_char_set_encoding(axis2_xml_reader_t *parser,
+ axis2_env_t **env)
+{
+ axis2_libxml2_reader_wrapper_impl_t *reader_impl = NULL;
+ AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
+ reader_impl = AXIS2_INTF_TO_IMPL(parser);
+ return xmlTextReaderConstEncoding(reader_impl->reader);
+}
axis2_status_t axis2_libxml2_reader_wrapper_fill_maps(axis2_xml_reader_t *parser,
axis2_env_t **env)
Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_model_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_model_builder.c?rev=368007&r1=368006&r2=368007&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_model_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_model_builder.c Wed Jan 11 03:07:02 2006
@@ -296,7 +296,7 @@
builder_impl->element_level++;
if(builder_impl->last_node_status == AXIS2_BUILDER_LAST_NODE_NULL)
{
- axis2_soap_model_builder_construct_node(builder, env, NULL, current_node, TRUE);
+ axis2_soap_model_builder_construct_node(builder, env, NULL, current_node, AXIS2_TRUE);
}else if(builder_impl->last_node_status == AXIS2_BUILDER_LAST_NODE_DONE_TRUE)
{
@@ -419,7 +419,7 @@
AXIS2_SOAP_FAULT_SET_SOAP_VERSION(soap_fault, env, builder_impl->soap_version);
AXIS2_SOAP_BODY_ADD_FAULT(soap_body, env, soap_fault);
- builder_impl->processing_fault = TRUE;
+ builder_impl->processing_fault = AXIS2_TRUE;
builder_impl->processing_mandatory_fault_elements = AXIS2_TRUE;
if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI,