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 sa...@apache.org on 2005/11/24 04:47:04 UTC
svn commit: r348631 - in /webservices/axis2/trunk/c/modules: test/om/src/
xml/om/src/ xml/parser/ xml/parser/guththila/impl/src/
xml/parser/guththila/test/
Author: samisa
Date: Wed Nov 23 19:46:49 2005
New Revision: 348631
URL: http://svn.apache.org/viewcvs?rev=348631&view=rev
Log:
doc comments added
Modified:
webservices/axis2/trunk/c/modules/test/om/src/test_om.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h
webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h
webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c
webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c
Modified: webservices/axis2/trunk/c/modules/test/om/src/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/test_om.c?rev=348631&r1=348630&r2=348631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/test_om.c (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/test_om.c Wed Nov 23 19:46:49 2005
@@ -20,9 +20,15 @@
axis2_stream_t *stream = NULL;
axis2_error_t *error = NULL;
axis2_log_t *log = NULL;
-
+FILE *f = NULL;
/** a method that demonstrate creating a om model using an xml file */
+
+void read_input(char *buffer,int size)
+{
+ fread(buffer, sizeof(char),size,f);
+}
+
int
test_om_build (char *filename)
{
@@ -31,13 +37,16 @@
axis2_om_text_t *text = NULL;
axis2_om_document_t *document = NULL;
axis2_om_node_t *node1 = NULL, *node2 = NULL, *node3 = NULL;
- FILE *fp = NULL;
axis2_om_output_t *om_output = NULL;
axis2_om_namespace_t* ns = NULL;
axis2_pull_parser_t *pull_parser = NULL;
+ f =fopen(filename, "r");
+ if(!f)
+ return;
+
/** create pull parser */
- pull_parser = axis2_pull_parser_create_for_file(&environment, filename , NULL);
+ pull_parser = axis2_pull_parser_create_for_memory(&environment, read_input, NULL);
if(!pull_parser)
{
@@ -231,7 +240,8 @@
environment = axis2_env_create_with_error_stream_log(allocator, error, stream, log);
test_om_build (file_name);
test_om_serialize ();
-
+ test_om_build (file_name);
+ test_om_serialize ();
axis2_env_free(environment);
getchar();
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c?rev=348631&r1=348630&r2=348631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c Wed Nov 23 19:46:49 2005
@@ -230,6 +230,7 @@
axis2_om_node_t *node = NULL;
axis2_om_stax_builder_impl_t *builder = NULL;
+
AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, NULL);
builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
@@ -242,8 +243,7 @@
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_PULL_PARSER_VALUE_NULL, NULL);
}
-
-
+
if (AXIS2_OM_NODE_GET_BUILD_STATUS(builder->lastnode, env))
{
axis2_om_text_create (env,
@@ -584,6 +584,7 @@
{
axis2_om_node_t *parent;
axis2_om_stax_builder_impl_t *builder = NULL;
+
AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, AXIS2_FAILURE );
@@ -605,7 +606,7 @@
AXIS2_OM_NODE_SET_BUILD_STATUS((builder->lastnode), env, AXIS2_TRUE);
}
}
-
+
return AXIS2_SUCCESS;
}
@@ -617,7 +618,7 @@
int token = 0;
axis2_om_stax_builder_impl_t *builder = NULL;
axis2_om_node_t *node = NULL;
-
+ axis2_om_node_t *root = NULL;
AXIS2_FUNC_PARAM_CHECK(om_stax_builder, env, NULL);
builder = AXIS2_INTF_TO_IMPL(om_stax_builder);
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h?rev=348631&r1=348630&r2=348631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_pull_parser.h Wed Nov 23 19:46:49 2005
@@ -244,7 +244,7 @@
axis2_env_t **env);
/**
* Free function , this function wraps the underlying parser's
- * xml free function. For freing values obatined by calling
+ * xml free function. For freeing values obatined by calling
* pull parser api methods, This function must be used.
* @param parser pointer to axis2_pull_parser
* @param env environment, MUST NOT be NULL.
@@ -282,10 +282,10 @@
/**
* This create an instance of axis2_pull_parser to
* parse a xml document in a buffer. It takes a callback
- * function that takes a buffer and a size of the buffer
+ * function that takes a buffer and the size of the buffer
* The user must implement a function that takes in buffer
* and size and fill the buffer with specified size
- * witj xml stream, parser will call this function to fill the
+ * with xml stream, parser will call this function to fill the
* buffer on the fly while parsing.
* @param env environment MUST NOT be NULL.
* @param read_input_callback() callback function that fills
Modified: webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h?rev=348631&r1=348630&r2=348631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/axis2_xml_writer.h Wed Nov 23 19:46:49 2005
@@ -115,14 +115,25 @@
axis2_char_t *namespace_uri,
axis2_char_t *prefix);
/**
- * write empty_element
+ * write an element tag with localname
+ * @param writer xml_writer
+ * @param env environment
+ * @param localname localname
+ * @return status of the operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_empty_element)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *localname);
/**
- * write empty_element with namespace uri
+ * write empty_element with localname and namespace uri.
+ * @param writer xml writer
+ * @param env environment
+ * @param localname localname
+ * @param namespace uri
+ * @return status of the operation, AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_empty_element_with_namespace)(
@@ -132,6 +143,13 @@
axis2_char_t *namespace_uri);
/**
* write empty element with namespace uri and prefix
+ * @param writer xml_writer
+ * @param env environment
+ * @param localname localname
+ * @param namespace_uri namespace uri
+ * @param prefix prefix
+ * @return status of the operation, AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_empty_element_with_namespace_prefix)(
axis2_xml_writer_t *writer,
@@ -140,30 +158,59 @@
axis2_char_t *namespace_uri,
axis2_char_t *prefix);
/**
- * write end element
+ * write end tag with correct localname prefix resolved internally
+ * @param writer xml writer
+ * @param env environment
+ * @return status of the operation, AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on failure
*/
axis2_status_t (AXIS2_CALL *write_end_element)(axis2_xml_writer_t *writer,
axis2_env_t **env);
/**
* write end document
+ * @param writer xml writer
+ * @param env environment
+ * @return status of the operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_end_document)(axis2_xml_writer_t *writer,
axis2_env_t **env);
/**
- * write attribute
+ * write attribute with localname and value
+ * @param writer writer
+ * @param env environment
+ * @param localname localname
+ * @param value text value of attribute
+ * @return status of the operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *write_attribute)(axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *localname,
axis2_char_t *value);
-
+ /**
+ * @param writer
+ * @param env environment
+ * @param localname
+ * @param value text value of attribute
+ * @param namespace uri namespace uri
+ * @return status code of the operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_attribute_with_namespace)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *localname,
axis2_char_t *value,
axis2_char_t *namespace_uri);
-
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param localname localname
+ * @param value text value of attribute
+ * @param namespace uri namespaceuri
+ * @param prefix prefix
+ */
axis2_status_t (AXIS2_CALL *write_attribute_with_namespace_prefix)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
@@ -171,79 +218,201 @@
axis2_char_t *value,
axis2_char_t *namespace_uri,
axis2_char_t *prefix);
-
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param prefix prefix
+ * @param namespace uri namespaceuri
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
+
axis2_status_t (AXIS2_CALL *write_namespace)(axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *prefix,
axis2_char_t *namespace_uri);
-
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param namespace uri namespaceuri
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_default_namespace)
(axis2_xml_writer_t *writer,
axis2_env_t **env,
- axis2_char_t *namespace_uri);
+ axis2_char_t *namespace_uri);
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param value value
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
+
axis2_status_t (AXIS2_CALL *write_comment)(axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *value);
-
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param target pi target
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
+
+
axis2_status_t (AXIS2_CALL *write_processing_instruction)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *target);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param target pi target
+ * @param data pi data
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
+
axis2_status_t (AXIS2_CALL *write_processing_instruction_data)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *target,
axis2_char_t *data);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param data cdata
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_cdata)(axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *data);
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param dtd dtd
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_dtd)(axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *dtd);
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param name name
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_entity_ref)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *name);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_start_document)(
axis2_xml_writer_t *writer,
axis2_env_t **env);
-
+
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param version version
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_start_document_with_version)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *version);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param version version
+ * @param encoding encoding
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_start_document_with_version_encoding)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *encoding,
axis2_char_t *version);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param text text
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_characters)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *text);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param uri uri
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_char_t* (AXIS2_CALL *get_prefix)( axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *uri);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param prefix prefix
+ * @param uri uri
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *set_prefix)( axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *prefix,
axis2_char_t *uri);
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param uri uri
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *set_default_prefix)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
axis2_char_t *uri);
-
+
+ /**
+ * @param writer xml_writer
+ * @param env environment
+ * @param text text
+ * @param in_attr
+ * @return status of operation AXIS2_SUCCESS on success,
+ * AXIS2_FAILURE on error.
+ */
axis2_status_t (AXIS2_CALL *write_encoded)(
axis2_xml_writer_t *writer,
axis2_env_t **env,
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c?rev=348631&r1=348630&r2=348631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/impl/src/guththila_reader.c Wed Nov 23 19:46:49 2005
@@ -22,21 +22,14 @@
#include "guththila_defines.h"
-typedef struct guththila_file_reader_impl_t
+typedef struct guththila_reader_impl_t
{
guththila_reader_t reader;
FILE *fp;
-}guththila_file_reader_impl_t;
-
-
-typedef struct guththila_memory_reader_impl_t
-{
- guththila_reader_t reader;
-
int (*input_read_callback)(char *buffer,int size);
+}guththila_reader_impl_t;
+
-
-}guththila_memory_reader_impl_t;
@@ -44,10 +37,11 @@
guththila_reader_create_for_file (guththila_environment_t * environment,
char *filename)
{
-
- guththila_file_reader_impl_t *file_reader =
- (guththila_file_reader_impl_t *) GUTHTHILA_MALLOC ( environment->allocator,
- sizeof (guththila_file_reader_impl_t));
+ if(!filename)
+ return NULL;
+ guththila_reader_impl_t *file_reader =
+ (guththila_reader_impl_t *) GUTHTHILA_MALLOC ( environment->allocator,
+ sizeof (guththila_reader_impl_t));
if(!file_reader)
return NULL;
@@ -70,9 +64,9 @@
guththila_environment_t *environment,
int (*input_read_callback)(char *buffer,int size))
{
- guththila_memory_reader_impl_t *memory_reader =
- (guththila_memory_reader_impl_t *) GUTHTHILA_MALLOC (environment->allocator,
- sizeof (guththila_memory_reader_impl_t));
+ guththila_reader_impl_t *memory_reader =
+ (guththila_reader_impl_t *) GUTHTHILA_MALLOC (environment->allocator,
+ sizeof (guththila_reader_impl_t));
if(!memory_reader)
{
return NULL;
@@ -92,19 +86,14 @@
if (!r)
return;
-
- if(r->guththila_reader_type == GUTHTHILA_IN_MEMORY_READER);
- {
- GUTHTHILA_FREE(environment->allocator,(guththila_memory_reader_impl_t*)r);
- }
+
if(r->guththila_reader_type == GUTHTHILA_FILE_READER)
{
- if(((guththila_file_reader_impl_t*)r)->fp)
- fclose(((guththila_file_reader_impl_t*)r)->fp);
- GUTHTHILA_FREE(environment->allocator, (guththila_file_reader_impl_t*)r);
+ if(((guththila_reader_impl_t*)r)->fp)
+ fclose(((guththila_reader_impl_t*)r)->fp);
}
-
- return;
+ GUTHTHILA_FREE(environment->allocator, (guththila_reader_impl_t*)r);
+ return;
}
@@ -118,10 +107,10 @@
if(r->guththila_reader_type == GUTHTHILA_FILE_READER)
{
- return (int)fread (buffer + offset, 1, length,((guththila_file_reader_impl_t*)r)->fp);
+ return (int)fread (buffer + offset, 1, length,((guththila_reader_impl_t*)r)->fp);
}
else if(r->guththila_reader_type == GUTHTHILA_IN_MEMORY_READER)
- return ((guththila_memory_reader_impl_t*)r)->input_read_callback((buffer + offset), length);
+ return ((guththila_reader_impl_t*)r)->input_read_callback((buffer + offset), length);
return GUTHTHILA_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c?rev=348631&r1=348630&r2=348631&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/guththila/test/guththila_test.c Wed Nov 23 19:46:49 2005
@@ -184,6 +184,9 @@
guththila_xml_stream_writer_write_start_element(env,writer,"test");
guththila_xml_stream_writer_write_attribute(env,writer,"test","axis2c");
guththila_xml_stream_writer_write_comment(env,writer,"Hello");
+
+guththila_xml_stream_writer_write_empty_element_with_namespace(env,writer,"empty_element","t");
+
printf("\n\n\n\n");
guththila_xml_stream_writer_free(env, writer);