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 du...@apache.org on 2009/04/11 19:43:25 UTC
svn commit: r764223 - in /webservices/axis2/trunk/c/axiom:
src/xpath/xpath_internals_engine.c src/xpath/xpath_internals_iterators.c
test/xpath/Makefile.am test/xpath/test_xpath.c
test/xpath/test_xpath_streaming.c
Author: dumindu
Date: Sat Apr 11 17:43:24 2009
New Revision: 764223
URL: http://svn.apache.org/viewvc?rev=764223&view=rev
Log:
Commiting the patch attached for jira AXIS2C-1363.
Added the test_xpath_streaming.c to the linux build.
Added:
webservices/axis2/trunk/c/axiom/test/xpath/test_xpath_streaming.c
Modified:
webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_engine.c
webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_iterators.c
webservices/axis2/trunk/c/axiom/test/xpath/Makefile.am
webservices/axis2/trunk/c/axiom/test/xpath/test_xpath.c
Modified: webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_engine.c?rev=764223&r1=764222&r2=764223&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_engine.c (original)
+++ webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_engine.c Sat Apr 11 17:43:24 2009
@@ -1027,39 +1027,17 @@
if (context->node)
{
- if (context->streaming)
- {
- node->value = axiom_node_detach(context->node, context->env);
- }
- else
- {
- node->value = context->node;
- }
+ node->value = context->node;
node->type = AXIOM_XPATH_TYPE_NODE;
}
else if (context->attribute)
{
- if (context->streaming)
- {
- node->value =
- axiom_attribute_clone(context->attribute, context->env);
- }
- else
- {
- node->value = context->attribute;
- }
+ node->value = context->attribute;
node->type = AXIOM_XPATH_TYPE_ATTRIBUTE;
}
else if (context->ns)
{
- if (context->streaming)
- {
- node->value = axiom_namespace_clone(context->ns, context->env);
- }
- else
- {
- node->value = context->ns;
- }
+ node->value = context->ns;
node->type = AXIOM_XPATH_TYPE_NAMESPACE;
}
Modified: webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_iterators.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_iterators.c?rev=764223&r1=764222&r2=764223&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_iterators.c (original)
+++ webservices/axis2/trunk/c/axiom/src/xpath/xpath_internals_iterators.c Sat Apr 11 17:43:24 2009
@@ -36,7 +36,7 @@
axiom_node_t *context_node = NULL;
/* For streaming */
axiom_node_t *prev = NULL;
- axiom_xpath_operation_t * next_operation = NULL;
+ /*axiom_xpath_operation_t * next_operation = NULL;*/
AXIOM_XPATH_ITERATOR_INITIALIZE;
cur = axiom_node_get_first_child(context->node, context->env);
@@ -54,7 +54,7 @@
axiom_xpath_evaluate_predicate(context, op_next, op_predicate);
n_nodes_tot += n_nodes;
}
-
+/*
if (context->streaming)
{
if (n_nodes)
@@ -69,6 +69,7 @@
axiom_node_free_tree(prev, context->env);
}
}
+*/
}
/* Change the context node back to what it was */
Modified: webservices/axis2/trunk/c/axiom/test/xpath/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/xpath/Makefile.am?rev=764223&r1=764222&r2=764223&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/xpath/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/xpath/Makefile.am Sat Apr 11 17:43:24 2009
@@ -1,15 +1,22 @@
TESTS =
-noinst_PROGRAMS = test_xpath
-check_PROGRAMS = test_xpath
+noinst_PROGRAMS = test_xpath test_xpath_streaming
+check_PROGRAMS = test_xpath test_xpath_streaming
SUBDIRS =
AM_CFLAGS = -g -O2 -pthread
test_xpath_SOURCES = test_xpath.c
+test_xpath_streaming_SOURCES = test_xpath_streaming.c
+
test_xpath_LDADD = ../../../util/src/libaxutil.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
$(top_builddir)/src/xpath/libaxis2_xpath.la \
$(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+test_xpath_streaming_LDADD = ../../../util/src/libaxutil.la \
+ $(top_builddir)/src/om/libaxis2_axiom.la \
+ $(top_builddir)/src/xpath/libaxis2_xpath.la \
+ $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I ../../../include \
Modified: webservices/axis2/trunk/c/axiom/test/xpath/test_xpath.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/xpath/test_xpath.c?rev=764223&r1=764222&r2=764223&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/xpath/test_xpath.c (original)
+++ webservices/axis2/trunk/c/axiom/test/xpath/test_xpath.c Sat Apr 11 17:43:24 2009
@@ -110,7 +110,7 @@
evaluate_expressions(env, context, xpath_file);
test_tree_str = axiom_node_to_string(test_tree, env);
- /*printf("\n\nFinal XML\n-----------\n\"%s\"\n\n\n", test_tree_str);*/
+ printf("\n\nFinal XML\n-----------\n\"%s\"\n\n\n", test_tree_str);
}
/* Freeing memory */
Added: webservices/axis2/trunk/c/axiom/test/xpath/test_xpath_streaming.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/xpath/test_xpath_streaming.c?rev=764223&view=auto
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/xpath/test_xpath_streaming.c (added)
+++ webservices/axis2/trunk/c/axiom/test/xpath/test_xpath_streaming.c Sat Apr 11 17:43:24 2009
@@ -0,0 +1,468 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+Compiling For Windows:
+cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /I %AXIS2C_HOME%\include /c *.c
+link.exe /LIBPATH:%AXIS2C_HOME%\lib axutil.lib axiom.lib axis2_parser.lib axis2_engine.lib /OUT:test.exe *.obj
+*/
+#include <stdio.h>
+#include <axiom.h>
+#include <axis2_util.h>
+#include <axiom_soap.h>
+#include <axiom_xpath.h>
+
+/* Function headers */
+void output_results(const axutil_env_t *env, axiom_xpath_result_t *xpath_result);
+
+axiom_node_t *read_test_xml(const axutil_env_t *env, char *file_name);
+
+void output_results(const axutil_env_t *env,
+ axiom_xpath_result_t *xpath_result);
+
+void evaluate(const axutil_env_t *env,
+ axis2_char_t *expr_str);
+
+void evaluate_expressions(const axutil_env_t *env,
+ char *file_name);
+
+void add_namespaces(const axutil_env_t *env,
+ axiom_xpath_context_t *context,
+ char *file_name);
+
+int readline(FILE *fin, char *str);
+
+FILE *fcor;
+char *xml_file = "test.xml";
+char *xpath_file = "test.xpath";
+char *cor_file = "results.txt";
+char *ns_file = "test.ns";
+
+/*FILE *ftemp;*/
+
+int main(int argc, char *argv[])
+{
+ axiom_node_t *test_tree = NULL;
+ axis2_char_t *test_tree_str;
+
+ /* Create environment */
+ axutil_env_t *env =
+ axutil_env_create_all("xpath_test.log", AXIS2_LOG_LEVEL_TRACE);
+
+ /* Set input file */
+ if (argc > 1)
+ {
+ printf("Usage: test [xml_file xpath_file namespaces_file results_file]\n\n");
+ printf("\tLook at the example test case:");
+ printf(" test.xml, test.xpath test.ns\n\n");
+
+ if(argc > 4)
+ {
+ xml_file = argv[1];
+ xpath_file = argv[2];
+ ns_file = argv[3];
+ cor_file = argv[4];
+ }
+ }
+
+ /*Create the request */
+ test_tree = read_test_xml(env, (axis2_char_t *)xml_file);
+
+ fcor = fopen(cor_file, "r");
+ /*ftemp = fopen("temp.txt", "w");*/
+
+ if (!fcor)
+ {
+ printf("Error opening file: %s\n", cor_file);
+ }
+
+ if (test_tree)
+ {
+ test_tree_str = axiom_node_to_string(test_tree, env);
+ printf("\nTesting XML\n-----------\n\"%s\"\n\n\n", test_tree_str);
+
+ axiom_node_free_tree(test_tree, env);
+
+ evaluate_expressions(env, xpath_file);
+ }
+
+ /* Freeing memory */
+ if (env)
+ {
+ axutil_env_free((axutil_env_t *) env);
+ }
+
+ if(fcor)
+ {
+ fclose(fcor);
+ }
+
+ return 0;
+}
+
+int readline(FILE *fin, char *str)
+{
+ int i;
+
+ for (i = 0; 1; i++)
+ {
+ str[i] = (char)getc(fin);
+
+ if (str[i] == '\n' || str[i] == '\r' || str[i] == EOF)
+ {
+ break;
+ }
+ }
+
+ str[i] = '\0';
+
+ return i;
+}
+
+void add_namespaces(const axutil_env_t *env,
+ axiom_xpath_context_t *context,
+ char *file_name)
+{
+ FILE *fin = NULL;
+ char prefix[1024];
+ char uri[1024];
+ axiom_namespace_t *ns;
+
+ fin = fopen(file_name, "r");
+
+ if (!fin)
+ {
+ printf("Error opening file: %s\n", file_name);
+ return;
+ }
+
+ /* Compiling XPath expression */
+ while (1)
+ {
+ if (readline(fin, prefix) == 0)
+ {
+ break;
+ }
+
+ if (readline(fin, uri) == 0)
+ {
+ break;
+ }
+
+ ns = axiom_namespace_create(
+ env, (axis2_char_t *)uri, (axis2_char_t *)prefix);
+
+ if (ns)
+ {
+ axiom_xpath_register_namespace(context, ns);
+ }
+ }
+
+ fclose(fin);
+}
+
+void evaluate_expressions(
+ const axutil_env_t *env,
+ char *file_name)
+{
+ FILE *fin = NULL;
+ char str[1024];
+
+ fin = fopen(file_name, "r");
+
+ if (!fin)
+ {
+ printf("Error opening file: %s\n", file_name);
+ return;
+ }
+
+ /* Compiling XPath expression */
+ while (1)
+ {
+ if (readline(fin, str) == 0)
+ {
+ break;
+ }
+
+ if (str[0] == '#')
+ {
+ printf("\n\n%s", str + 1);
+ continue;
+ }
+
+ evaluate(env, (axis2_char_t *)str);
+ }
+
+ fclose(fin);
+}
+
+void evaluate(
+ const axutil_env_t *env,
+ axis2_char_t *expr_str)
+{
+ axiom_xpath_expression_t *expr = NULL;
+ axiom_xpath_result_t *result = NULL;
+ axiom_node_t *test_tree = NULL;
+ axiom_xpath_context_t *context = NULL;
+
+ test_tree = read_test_xml(env, (axis2_char_t *)xml_file);
+
+ if(!test_tree)
+ {
+ printf("Error reading file: %s\n", xml_file);
+ return;
+ }
+
+ /* Create XPath Context */
+ context = axiom_xpath_context_create((axutil_env_t *)env, test_tree);
+
+ if(!context)
+ {
+ printf("Could not initialise XPath context\n");
+ return;
+ }
+
+ /* Namespaces */
+ add_namespaces(env, context, ns_file);
+
+
+ printf("\nCompiling XPath expression: \"%s\" ...\n", expr_str);
+ expr = axiom_xpath_compile_expression(env, expr_str);
+
+ if (!expr)
+ {
+ printf("Compilation error.");
+ printf("Please check the systax of the XPath query.\n");
+
+ return;
+ }
+
+ /* Evaluating XPath expression */
+ printf("Evaluating...\n");
+ result = axiom_xpath_evaluate_streaming(context, expr);
+
+ if (!result)
+ {
+ compare_result("");
+ printf("An error occured while evaluating the expression.\n");
+
+ axiom_xpath_free_expression(env, expr);
+
+ return;
+ }
+
+ if (result->flag == AXIOM_XPATH_ERROR_STREAMING_NOT_SUPPORTED)
+ {
+ compare_result("");
+ printf("Streaming not supported.\n");
+
+ axiom_xpath_free_expression(env, expr);
+
+ return;
+ }
+
+ output_results(env, result);
+
+ if (result)
+ {
+ axiom_xpath_free_result(env, result);
+ }
+
+ if (expr)
+ {
+ axiom_xpath_free_expression(env, expr);
+ }
+}
+
+int compare_result(axis2_char_t *rs)
+{
+ int i;
+ char c;
+
+ /*fprintf(ftemp, "%s#", rs);*/
+
+ if(!fcor)
+ {
+ return 0;
+ }
+
+ for(i = 0; 1; i++)
+ {
+ while(rs[i] == ' ' || rs[i] == '\n' || rs[i] == '\r' || rs[i] == '\t')
+ {
+ i++;
+ }
+
+ do
+ {
+ c = (char)getc(fcor);
+ }
+ while(c == ' ' || c == '\n' || c == '\r' || c == '\t');
+
+ if(c == '#' || c == EOF)
+ {
+ break;
+ }
+
+ if(c != rs[i])
+ {
+ while(c != '#' && c != EOF)
+ {
+ c = getc(fcor);
+ }
+
+ return 0;
+ }
+ }
+
+ return rs[i] == '\0';
+}
+
+void output_results(const axutil_env_t *env,
+ axiom_xpath_result_t *xpath_result)
+{
+ axiom_xpath_result_node_t *xpath_result_node;
+ axiom_node_t *result_node;
+ axis2_char_t *result_str;
+ axis2_char_t result_set[100000];
+ axis2_char_t temp_res[100000];
+
+ axiom_element_t *ele;
+ int i;
+
+ result_set[0] = '\n';
+ result_set[1] = '\0';
+
+ for (i = 0; i < axutil_array_list_size(xpath_result->nodes, env); i++)
+ {
+ xpath_result_node = axutil_array_list_get(xpath_result->nodes, env, i);
+
+ if (xpath_result_node->type == AXIOM_XPATH_TYPE_NODE)
+ {
+ result_node = xpath_result_node->value;
+ ele = (axiom_element_t *)axiom_node_get_data_element(
+ result_node, env);
+
+ if (ele)
+ {
+ /*result_str = axiom_element_get_text(ele, env, result_node);*/
+ result_str = axiom_node_to_string(result_node, env);
+
+ sprintf(temp_res, "\"%s\"\n", result_str);
+ strcat(result_set, temp_res);
+ }
+ }
+ else if (xpath_result_node->type == AXIOM_XPATH_TYPE_ATTRIBUTE)
+ {
+ result_str =
+ axiom_attribute_get_localname(xpath_result_node->value, env);
+ sprintf(temp_res, "%s = ", result_str);
+ strcat(result_set, temp_res);
+ result_str =
+ axiom_attribute_get_value(xpath_result_node->value, env);
+ sprintf(temp_res, "\"%s\"\n", result_str);
+ strcat(result_set, temp_res);
+ }
+ else if (xpath_result_node->type == AXIOM_XPATH_TYPE_NAMESPACE)
+ {
+ result_str =
+ axiom_namespace_get_prefix(xpath_result_node->value, env);
+ sprintf(temp_res, "%s = ", result_str);
+ strcat(result_set, temp_res);
+ result_str =
+ axiom_namespace_get_uri(xpath_result_node->value, env);
+ sprintf(temp_res, "\"%s\"\n", result_str);
+ strcat(result_set, temp_res);
+ }
+ else if (xpath_result_node->type == AXIOM_XPATH_TYPE_BOOLEAN)
+ {
+ sprintf(temp_res, "\"%s\"\n",
+ (*(axis2_bool_t *)xpath_result_node->value) ? "true" : "false");
+ strcat(result_set, temp_res);
+ }
+ else if (xpath_result_node->type == AXIOM_XPATH_TYPE_TEXT)
+ {
+ sprintf(temp_res, "\"%s\"\n",
+ (axis2_char_t *)xpath_result_node->value);
+ strcat(result_set, temp_res);
+ }
+ else if (xpath_result_node->type == AXIOM_XPATH_TYPE_NUMBER)
+ {
+ sprintf(temp_res, "\"%lf\"\n",
+ *(double *)xpath_result_node->value);
+ strcat(result_set, temp_res);
+ }
+ }
+
+ if(compare_result(result_set))
+ {
+ printf("Test case passed\n");
+ }
+ else
+ {
+ printf("Failed test case!\nOutput\n%s\n", result_set);
+ }
+}
+
+axiom_node_t *read_test_xml(const axutil_env_t *env, axis2_char_t *file_name)
+{
+ axiom_xml_reader_t *reader = NULL;
+ axiom_stax_builder_t *builder = NULL;
+ axiom_document_t *document = NULL;
+ axiom_node_t *root = NULL;
+
+ /* Create parser */
+ reader = axiom_xml_reader_create_for_file(env, file_name, NULL);
+
+ if (!reader)
+ {
+ printf("Error creating pullparser");
+ return NULL;
+ }
+
+ /* Create axiom_stax_builder */
+ builder = axiom_stax_builder_create(env, reader);
+
+ if (!builder)
+ {
+ printf("Error creating pull parser");
+ return NULL;
+ }
+
+ /* Create an om document */
+ document = axiom_stax_builder_get_document(builder, env);
+
+ if (!document)
+ {
+ printf("Error creating document");
+ return NULL;
+ }
+
+ /* Get root element */
+ root = axiom_document_get_root_element(document, env);
+ if (!root)
+ {
+ printf("Root element null ");
+ axiom_stax_builder_free(builder, env);
+ return NULL;
+ }
+
+ while (axiom_document_build_next(document, env));
+
+ return root;
+}