Author: damitha
Date: Tue Oct 14 02:51:23 2008
New Revision: 704421
URL: http://svn.apache.org/viewvc?rev=704421&view=rev
Log:
Code formatting
Modified:
webservices/savan/trunk/c/src/util/db_mgr.c
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/src/util/db_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/db_mgr.c?rev=704421&r1=704420&r2=704421&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/db_mgr.c (original)
+++ webservices/savan/trunk/c/src/util/db_mgr.c Tue Oct 14 02:51:23 2008
@@ -73,8 +73,7 @@
savan_db_mgr_t *db_mgr,
const axutil_env_t *env)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_db_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:savan_db_mgr_free");
if(db_mgr->dbname)
{
@@ -87,8 +86,7 @@
AXIS2_FREE(env->allocator, db_mgr);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Exit:savan_db_mgr_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Exit:savan_db_mgr_free");
}
AXIS2_EXTERN int
@@ -119,6 +117,7 @@
axutil_array_list_add(topic_list, env, argv[i]);
}
}
+
return 0;
}
@@ -134,16 +133,19 @@
savan_db_mgr_args_t *args = (savan_db_mgr_args_t *) not_used;
const axutil_env_t *env = args->env;
axutil_array_list_t *subscriber_list = (axutil_array_list_t *) args->data;
+
if(argc < 1)
{
args->data = NULL;
return 0;
}
+
if(!subscriber_list)
{
subscriber_list = axutil_array_list_create(env, 0);
args->data = subscriber_list;
}
+
if(argc > 0)
{
subscriber = savan_subscriber_create(env);
@@ -155,34 +157,41 @@
{
savan_subscriber_set_id(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "end_to"))
{
axis2_endpoint_ref_t *endto_epr = NULL;
endto_epr = axis2_endpoint_ref_create(env, argv[i]);
savan_subscriber_set_end_to(subscriber, env, endto_epr);
}
+
if(0 == axutil_strcmp(col_name[i], "notify_to") )
{
axis2_endpoint_ref_t *notify_epr = NULL;
notify_epr = axis2_endpoint_ref_create(env, argv[i]);
savan_subscriber_set_notify_to(subscriber, env, notify_epr);
}
+
if(0 == axutil_strcmp(col_name[i], "delivery_mode") )
{
savan_subscriber_set_delivery_mode(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "expires") )
{
savan_subscriber_set_expires(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "filter") )
{
savan_subscriber_set_filter(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "topic_url") )
{
savan_subscriber_set_topic(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "renewed") )
{
savan_subscriber_set_renew_status(subscriber, env,
@@ -191,7 +200,10 @@
}
if(subscriber)
+ {
axutil_array_list_add(subscriber_list, env, subscriber);
+ }
+
return 0;
}
@@ -208,61 +220,70 @@
savan_db_mgr_args_t *args = (savan_db_mgr_args_t *) not_used;
env = args->env;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_db_mgr_subs_retrieve_callback");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_db_mgr_subs_retrieve_callback");
+
subscriber = (savan_subscriber_t *) args->data;
if(argc < 1)
{
args->data = NULL;
return 0;
}
+
if(!subscriber && argc > 0)
{
subscriber = savan_subscriber_create(env);
args->data = subscriber;
}
+
for(i = 0; i < argc; i++)
{
if(0 == axutil_strcmp(col_name[i], "id"))
{
savan_subscriber_set_id(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "end_to"))
{
axis2_endpoint_ref_t *endto_epr = NULL;
endto_epr = axis2_endpoint_ref_create(env, argv[i]);
savan_subscriber_set_end_to(subscriber, env, endto_epr);
}
+
if(0 == axutil_strcmp(col_name[i], "notify_to"))
{
axis2_endpoint_ref_t *notify_epr = NULL;
notify_epr = axis2_endpoint_ref_create(env, argv[i]);
savan_subscriber_set_notify_to(subscriber, env, notify_epr);
}
+
if(0 == axutil_strcmp(col_name[i], "delivery_mode"))
{
savan_subscriber_set_delivery_mode(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "expires"))
{
savan_subscriber_set_expires(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "filter"))
{
savan_subscriber_set_filter(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "topic_url"))
{
savan_subscriber_set_topic(subscriber, env, argv[i]);
}
+
if(0 == axutil_strcmp(col_name[i], "renewed"))
{
savan_subscriber_set_renew_status(subscriber, env,
AXIS2_ATOI(argv[i]));
}
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_db_mgr_subs_retrieve_callback");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_db_mgr_subs_retrieve_callback");
return 0;
}
@@ -355,86 +376,106 @@
}
sprintf(sql_insert, "%s%s", sql_insert, ");");
}
+
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_insert:%s", sql_insert);
dbconn = (sqlite3 *) savan_db_mgr_get_dbconn(env, dbname);
if(!dbconn)
+ {
return AXIS2_FAILURE;
+ }
counter = 1;
if (sqlite3_prepare(dbconn, sql_insert, strlen(sql_insert), &insertqry,
NULL))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
}
if (sqlite3_bind_text(insertqry, counter, id, strlen(id), SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] id:%s", id);
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] id:%s", id);
if(endto)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] endto:%s", endto);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] endto:%s", endto);
counter++;
- if (sqlite3_bind_text(insertqry, counter, endto, strlen(endto),
- SQLITE_STATIC))
+ if (sqlite3_bind_text(insertqry, counter, endto, strlen(endto),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
}
if(notifyto)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] notifyto:%s",
notifyto);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] notifyto:%s",
notifyto);
counter++;
- if (sqlite3_bind_text(insertqry, counter, notifyto, strlen(notifyto),
- SQLITE_STATIC))
+ if (sqlite3_bind_text(insertqry, counter, notifyto, strlen(notifyto),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
}
if(delivery_mode)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] delivery_mode:%s",
delivery_mode);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] delivery_mode:%s",
delivery_mode);
counter++;
if (sqlite3_bind_text(insertqry, counter, delivery_mode,
strlen(delivery_mode), SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
}
if(expires)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] expires:%s",
expires);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] expires:%s", expires);
counter++;
if (sqlite3_bind_text(insertqry, counter, expires, strlen(expires),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
}
if(filter)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] filter:%s", filter);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] filter:%s", filter);
counter++;
if (sqlite3_bind_text(insertqry, counter, filter, strlen(filter),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
}
if(topic)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] topic:%s", topic);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] topic:%s", topic);
counter++;
if (sqlite3_bind_text(insertqry, counter, topic, strlen(topic),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
counter++;
if (sqlite3_bind_int(insertqry, counter, renewed))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] renewed:%d", renewed);
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ }
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] renewed:%d", renewed);
if (sqlite3_step(insertqry) == SQLITE_DONE)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Subscriber is added to the database");
+ "[savan] Subscriber is added to the database");
sqlite3_reset(insertqry);
}
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
}
sqlite3_finalize(insertqry);
@@ -463,6 +504,7 @@
axis2_endpoint_ref_t *notifyto_epr = NULL;
int counter = 1;
struct sqlite3_stmt* updateqry;
+
sql_update = AXIS2_MALLOC(env->allocator, 1028);
sprintf(sql_update, "%s", "update subscriber set ");
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_update:%s",
sql_update);
@@ -473,8 +515,7 @@
endto_epr = savan_subscriber_get_end_to(subscriber, env);
if(endto_epr)
{
- endto = (axis2_char_t *) axis2_endpoint_ref_get_address(endto_epr,
- env);
+ endto = (axis2_char_t *) axis2_endpoint_ref_get_address(endto_epr,
env);
if(endto)
{
sprintf(sql_update, "%s%s", sql_update, "end_to=?, ");
@@ -482,11 +523,11 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_update:%s",
sql_update);
}
}
+
notifyto_epr = savan_subscriber_get_notify_to(subscriber, env);
if(notifyto_epr)
{
- notifyto = (axis2_char_t *) axis2_endpoint_ref_get_address(
- notifyto_epr, env);
+ notifyto = (axis2_char_t *)
axis2_endpoint_ref_get_address(notifyto_epr, env);
if(notifyto)
{
sprintf(sql_update, "%s%s", sql_update, "notify_to=?, ");
@@ -494,24 +535,28 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_update:%s",
sql_update);
}
}
+
delivery_mode = savan_subscriber_get_delivery_mode(subscriber, env);
if(delivery_mode)
{
sprintf(sql_update, "%s%s", sql_update, "delivery_mode=?, ");
counter++;
}
+
expires = savan_subscriber_get_expires(subscriber, env);
if(expires)
{
sprintf(sql_update, "%s%s", sql_update, "expires=?, ");
counter++;
}
+
filter = savan_subscriber_get_filter(subscriber, env);
if(filter)
{
sprintf(sql_update, "%s%s", sql_update, "filter=?, ");
counter++;
}
+
topic_url = savan_subscriber_get_topic(subscriber, env);
if(topic_url)
{
@@ -519,90 +564,117 @@
sprintf(sql_update, "%s%s", sql_update, "topic_name=?, ");
counter++;
}
+
renewed = (int) savan_subscriber_get_renew_status(subscriber, env);
sprintf(sql_update, "%s%s", sql_update, "renewed=? where id=?;");
}
+
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "sql_update:%s", sql_update);
dbconn = (sqlite3 *) savan_db_mgr_get_dbconn(env, dbname);
if(!dbconn)
+ {
return AXIS2_FAILURE;
+ }
counter = 0;
if (sqlite3_prepare(dbconn, sql_update, strlen(sql_update), &updateqry,
NULL))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
}
+
if(endto)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] endto:%s", endto);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] endto:%s", endto);
counter++;
- if (sqlite3_bind_text(updateqry, counter, endto, strlen(endto),
- SQLITE_STATIC))
+ if (sqlite3_bind_text(updateqry, counter, endto, strlen(endto),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
if(notifyto)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] notifyto:%s",
notifyto);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] notifyto:%s",
notifyto);
counter++;
- if (sqlite3_bind_text(updateqry, counter, notifyto, strlen(notifyto),
- SQLITE_STATIC))
+ if (sqlite3_bind_text(updateqry, counter, notifyto, strlen(notifyto),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
if(delivery_mode)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] delivery_mode:%s",
delivery_mode);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] delivery_mode:%s",
delivery_mode);
counter++;
if (sqlite3_bind_text(updateqry, counter, delivery_mode,
strlen(delivery_mode), SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
if(expires)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] expires:%s",
expires);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] expires:%s", expires);
counter++;
if (sqlite3_bind_text(updateqry, counter, expires, strlen(expires),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
if(filter)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] filter:%s", filter);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] filter:%s", filter);
counter++;
if (sqlite3_bind_text(updateqry, counter, filter, strlen(filter),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
if(topic)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] topic:%s", topic);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] topic:%s", topic);
counter++;
if (sqlite3_bind_text(updateqry, counter, topic, strlen(topic),
SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
}
+
counter++;
if (sqlite3_bind_int(updateqry, counter, renewed))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] renewed:%d", renewed);
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] renewed:%d", renewed);
counter++;
if (sqlite3_bind_text(updateqry, counter, id, strlen(id), SQLITE_STATIC))
+ {
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVANC] id:%s", id);
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ }
+
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] id:%s", id);
if (sqlite3_step(updateqry) == SQLITE_DONE)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Subscriber is updated to the database");
+ "[savan] Subscriber is updated to the database");
sqlite3_reset(updateqry);
}
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Update Error: %s", sqlite3_errmsg(dbconn));
+ "[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
}
AXIS2_FREE(env->allocator, sql_update);
@@ -666,41 +738,44 @@
axis2_char_t *error_msg = NULL;
sqlite3 *dbconn = NULL;
int rc = -1;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
+
dbconn = (sqlite3 *) savan_db_mgr_get_dbconn(env, dbname);
if(!dbconn)
+ {
return AXIS2_FAILURE;
+ }
+
rc = sqlite3_exec(dbconn, "BEGIN;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "BEGIN;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "BEGIN;", 0, 0, &error_msg, rc);
}
+
rc = sqlite3_exec(dbconn, sql_stmt_remove, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
- rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_remove,
- 0, 0, &error_msg, rc);
+ {
+ rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_remove, 0, 0,
&error_msg, rc);
+ }
if(rc != SQLITE_OK )
{
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "ROLLBACK;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "ROLLBACK;", 0, 0,
&error_msg, rc);
}
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Error Sql Remove Stmt: %s. Sql Error: %s",
sql_stmt_remove,
- error_msg);
+ "[savan] Error Sql Remove Stmt: %s. Sql Error: %s",
sql_stmt_remove, error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
return AXIS2_FAILURE;
}
+
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "COMMIT;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg,
rc);
}
+
sqlite3_close(dbconn);
return AXIS2_SUCCESS;
}
@@ -714,46 +789,49 @@
sqlite3 *dbconn = NULL;
axis2_char_t *error_msg = NULL;
int rc = -1;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_db_mgr_update");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_db_mgr_update");
dbconn = (sqlite3 *) savan_db_mgr_get_dbconn(env, dbname);
if(!dbconn)
+ {
return AXIS2_FAILURE;
+ }
+
rc = sqlite3_exec(dbconn, "BEGIN;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "BEGIN;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "BEGIN;", 0, 0, &error_msg, rc);
}
+
rc = sqlite3_exec(dbconn, sql_stmt_update, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
- rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_update,
- 0, 0, &error_msg, rc);
+ {
+ rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_update, 0, 0,
&error_msg, rc);
+ }
if(rc != SQLITE_OK )
{
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "ROLLBACK;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "ROLLBACK;", 0, 0,
&error_msg, rc);
}
+
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Error Sql Update Stmt:%s", sql_stmt_update);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[SAVAN] Sql Update Error:%s",
- error_msg);
+ "[savan] Error Sql Update Stmt:%s", sql_stmt_update);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Sql Update Error:%s",
error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
return AXIS2_FAILURE;
}
+
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "COMMIT;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg,
rc);
}
sqlite3_close(dbconn);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] End:savan_db_mgr_update");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_db_mgr_update");
return AXIS2_SUCCESS;
}
@@ -769,26 +847,32 @@
savan_subscriber_t *subscriber = NULL;
sqlite3 *dbconn = NULL;
int rc = -1;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_db_mgr_retrieve");
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_db_mgr_retrieve");
+
dbconn = (sqlite3 *) savan_db_mgr_get_dbconn(env, dbname);
if(!dbconn)
+ {
return NULL;
+ }
+
rc = sqlite3_exec(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "BEGIN READ_ONLY;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "BEGIN READ_ONLY;", 0, 0,
&error_msg, rc);
}
+
args = AXIS2_MALLOC(env->allocator, sizeof(savan_db_mgr_args_t));
args->env = (axutil_env_t*)env;
args->data = NULL;
- rc = sqlite3_exec(dbconn, sql_stmt_retrieve, retrieve_func, args,
- &error_msg);
+
+ rc = sqlite3_exec(dbconn, sql_stmt_retrieve, retrieve_func, args,
&error_msg);
if(rc == SQLITE_BUSY)
- rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_retrieve,
- retrieve_func, args, &error_msg, rc);
+ {
+ rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_retrieve,
retrieve_func, args, &error_msg,
+ rc);
+ }
+
if(rc != SQLITE_OK )
{
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
@@ -798,25 +882,30 @@
"ROLLBACK;", 0, 0, &error_msg, rc);
}
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Error Sql Retrieve Stmt: %s. Sql Error: %s",
- sql_stmt_retrieve, error_msg);
+ "[savan] Error Sql Retrieve Stmt: %s. Sql Error: %s",
sql_stmt_retrieve, error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
return AXIS2_FALSE;
}
+
if(args->data)
+ {
subscriber = (savan_subscriber_t *) args->data;
+ }
+
if(args)
+ {
AXIS2_FREE(env->allocator, args);
+ }
+
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "COMMIT;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "COMMIT;", 0, 0, &error_msg,
rc);
}
sqlite3_close(dbconn);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_db_mgr_retrieve");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_db_mgr_retrieve");
return subscriber;
}
@@ -832,7 +921,6 @@
int rc = -1;
sqlite3 *dbconn = NULL;
axis2_char_t *error_msg = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FALSE);
data_list = axutil_array_list_create(env, 0);
if(!data_list)
{
@@ -850,11 +938,10 @@
rc = sqlite3_exec(dbconn, "BEGIN READ_ONLY;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
- rc = savan_db_mgr_busy_handler(dbconn,
- "BEGIN READ_ONLY;", 0, 0, &error_msg, rc);
+ rc = savan_db_mgr_busy_handler(dbconn, "BEGIN READ_ONLY;", 0, 0,
&error_msg, rc);
}
- rc = sqlite3_exec(dbconn, sql_stmt_find, find_func, args,
- &error_msg);
+ rc = sqlite3_exec(dbconn, sql_stmt_find, find_func, args, &error_msg);
+
if(rc == SQLITE_BUSY)
{
rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_find,
@@ -862,7 +949,10 @@
}
if(args->data)
+ {
data_list = (axutil_array_list_t *) args->data;
+ }
+
if(rc != SQLITE_OK )
{
rc = sqlite3_exec(dbconn, "ROLLBACK;", 0, 0, &error_msg);
@@ -871,26 +961,38 @@
rc = savan_db_mgr_busy_handler(dbconn,
"ROLLBACK;", 0, 0, &error_msg, rc);
}
+
if(data_list)
+ {
axutil_array_list_free(data_list, env);
+ }
+
if(args)
+ {
AXIS2_FREE(env->allocator, args);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Error Sql Retrieve All Stmt:%s", sql_stmt_find);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Sql Retrieve All Error:%s", error_msg);
+ }
+
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Error Sql Retrieve
All Stmt:%s",
+ sql_stmt_find);
+
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Sql Retrieve All
Error:%s", error_msg);
sqlite3_free(error_msg);
sqlite3_close(dbconn);
return NULL;
}
+
if(args)
+ {
AXIS2_FREE(env->allocator, args);
+ }
+
rc = sqlite3_exec(dbconn, "COMMIT;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
rc = savan_db_mgr_busy_handler(dbconn,
"COMMIT;", 0, 0, &error_msg, rc);
}
+
sqlite3_close(dbconn);
return data_list;
}
@@ -1004,7 +1106,7 @@
rc = sqlite3_open(dbname, &dbconn);
if(rc != SQLITE_OK)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Can't open database: %s
sqlite error: %s\n",
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Can't open database:
%s sqlite error: %s\n",
dbname, sqlite3_errmsg(dbconn));
sqlite3_close(dbconn);
@@ -1038,8 +1140,7 @@
endto_epr = savan_subscriber_get_end_to(subscriber, env);
endto = (axis2_char_t *) axis2_endpoint_ref_get_address(endto_epr, env);
notifyto_epr = savan_subscriber_get_notify_to(subscriber, env);
- notifyto = (axis2_char_t *) axis2_endpoint_ref_get_address(notifyto_epr,
- env);
+ notifyto = (axis2_char_t *) axis2_endpoint_ref_get_address(notifyto_epr,
env);
delivery_mode = savan_subscriber_get_delivery_mode(subscriber, env);
expires = savan_subscriber_get_expires(subscriber, env);
filter = savan_subscriber_get_filter(subscriber, env);
@@ -1049,6 +1150,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "topic_url:%s", topic_url);
topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
}
+
renewed = savan_subscriber_get_renew_status(subscriber, env);
sprintf(sql_update, "update subscriber set end_to='%s', notify_to='%s',"\
Modified: webservices/savan/trunk/c/src/util/savan_util.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/savan_util.c?rev=704421&r1=704420&r2=704421&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Tue Oct 14 02:51:23 2008
@@ -579,8 +579,6 @@
axutil_hash_t *store = NULL;
axutil_param_t *param = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan] Entry:set_sub_store");
/* Create a hash map */
@@ -679,11 +677,11 @@
axiom_node_t *ret_node = NULL;
savan_subscriber_t *subscriber = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Start:savan_util_get_subscriber_from_remote_subs_mgr");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Entry:savan_util_get_subscriber_from_remote_subs_mgr");
+
svc_client = (axis2_svc_client_t *) s_client;
- options = (axis2_options_t *)axis2_svc_client_get_options(svc_client,
- env);
+ options = (axis2_options_t *)axis2_svc_client_get_options(svc_client, env);
endpoint_ref = axis2_endpoint_ref_create(env, subs_mgr_url);
axis2_options_set_to(options, env, endpoint_ref);
@@ -695,13 +693,12 @@
}
else
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[savan] Stub invoke FAILED: Error code:"
- " %d :: %s", env->error->error_number,
- AXIS2_ERROR_GET_MESSAGE(env->error));
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Stub invoke FAILED:
Error code:"
+ " %d :: %s", env->error->error_number,
AXIS2_ERROR_GET_MESSAGE(env->error));
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] End:savan_util_get_subscriber_from_remote_subs_mgr");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Exit:savan_util_get_subscriber_from_remote_subs_mgr");
return subscriber;
}
@@ -745,8 +742,7 @@
savan_subscriber_t *subscriber = NULL;
sub_node = axiom_node_get_first_child(node, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Start:process_subscriber_node");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:process_subscriber_node");
sub_elem = axiom_node_get_data_element(sub_node, env);
if(sub_node)
@@ -846,8 +842,8 @@
savan_subscriber_set_filter(subscriber, env, filter);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] End:process_subscriber_node");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:process_subscriber_node");
return subscriber;
}
@@ -865,8 +861,9 @@
axiom_node_t *ret_node = NULL;
axutil_array_list_t *subscriber_list = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan]Start:savan_util_get_subscriber_list_from_remote_subs_mgr");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Entry:savan_util_get_subscriber_list_from_remote_subs_mgr");
+
svc_client = (axis2_svc_client_t *) s_client;
options = (axis2_options_t *)axis2_svc_client_get_options(svc_client,
env);
@@ -886,8 +883,8 @@
" %d :: %s", env->error->error_number,
AXIS2_ERROR_GET_MESSAGE(env->error));
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan]End:savan_util_get_subscriber_list_from_remote_subs_mgr");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Exit:savan_util_get_subscriber_list_from_remote_subs_mgr");
return subscriber_list;
}
@@ -932,8 +929,8 @@
axis2_char_t *topic_url = NULL;
axutil_array_list_t *subscriber_list = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Start:process_subscriber_list_node");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Entry:process_subscriber_list_node");
subs_list_element = axiom_node_get_data_element(subs_list_node, env);
/* Topic */
@@ -951,10 +948,10 @@
axutil_qname_free(qname, env);
if(!subs_iter)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Subscribers list is empty");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Subscribers list is
empty");
return NULL;
}
+
if(axiom_children_qname_iterator_has_next(subs_iter, env))
{
subscriber_list = axutil_array_list_create(env, 0);
@@ -994,8 +991,8 @@
subscriber = savan_subscriber_create(env);
if (!subscriber)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to
create a"
- "subscriber instance");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[savan] Failed to create a subscriber instance");
return NULL;
}
/* Now read each sub element of Subscribe element */
@@ -1061,8 +1058,7 @@
axutil_array_list_add(subscriber_list, env, subscriber);
}
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] End:process_subscriber_list_node");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:process_subscriber_list_node");
return subscriber_list;
}
@@ -1099,11 +1095,18 @@
axis2_char_t *id = NULL;
axis2_endpoint_ref_t *notify_ref = NULL;
axis2_endpoint_ref_t *endto_ref = savan_subscriber_get_end_to(subscriber,
env);
+
if(endto_ref)
+ {
endto = axis2_endpoint_ref_get_address(endto_ref, env);
+ }
+
notify_ref = savan_subscriber_get_notify_to(subscriber, env);
if(notify_ref)
+ {
notify = axis2_endpoint_ref_get_address(notify_ref, env);
+ }
+
filter = savan_subscriber_get_filter(subscriber, env);
expires = savan_subscriber_get_expires(subscriber, env);
id = savan_subscriber_get_id(subscriber, env);
@@ -1122,30 +1125,29 @@
topic_elem = axiom_element_create(env, add_node, ELEM_NAME_TOPIC, ns1,
&topic_node);
topic = savan_subscriber_get_topic(subscriber, env);
if(topic)
+ {
axiom_element_set_text(topic_elem, env, topic, topic_node);
+ }
+
/* create the subscriber element */
sub_elem = axiom_element_create(env, add_node, ELEM_NAME_SUBSCRIBE, ns,
&sub_node);
/* EndTo element */
- endto_elem = axiom_element_create(env, sub_node, ELEM_NAME_ENDTO, ns,
- &endto_node);
+ endto_elem = axiom_element_create(env, sub_node, ELEM_NAME_ENDTO, ns,
&endto_node);
axiom_element_set_text(endto_elem, env, endto, endto_node);
/* Delivery element */
- delivery_elem = axiom_element_create(env, sub_node, ELEM_NAME_DELIVERY, ns,
- &delivery_node);
+ delivery_elem = axiom_element_create(env, sub_node, ELEM_NAME_DELIVERY,
ns, &delivery_node);
- notify_elem = axiom_element_create(env, delivery_node, ELEM_NAME_NOTIFYTO,
ns,
- ¬ify_node);
+ notify_elem = axiom_element_create(env, delivery_node, ELEM_NAME_NOTIFYTO,
ns, ¬ify_node);
axiom_element_set_text(notify_elem, env, notify, notify_node);
/* Expires element */
- expires_elem = axiom_element_create(env, sub_node, ELEM_NAME_EXPIRES, ns,
- &expires_node);
+ expires_elem = axiom_element_create(env, sub_node, ELEM_NAME_EXPIRES, ns,
&expires_node);
axiom_element_set_text(expires_elem, env, expires, expires_node);
+
/* Filter element */
- filter_elem = axiom_element_create(env, sub_node, ELEM_NAME_FILTER, ns,
- &endto_node);
+ filter_elem = axiom_element_create(env, sub_node, ELEM_NAME_FILTER, ns,
&endto_node);
axiom_element_set_text(filter_elem, env, filter, filter_node);
return add_node;
@@ -1189,8 +1191,6 @@
return remove_node;
}*/
-/******************************************************************************/
-
axis2_char_t * AXIS2_CALL
savan_util_get_expiry_time(
const axutil_env_t *env)
@@ -1200,8 +1200,6 @@
return NULL;
}
-/******************************************************************************/
-
axis2_char_t * AXIS2_CALL
savan_util_get_renewed_expiry_time(
const axutil_env_t *env,
@@ -1219,9 +1217,13 @@
{
axis2_char_t *topic = NULL;
axis2_char_t *temp = NULL;
+
temp = axutil_rindex(topic_url, '/') + 1;
if(temp)
+ {
topic = axutil_strdup(env, temp);
+ }
+
return topic;
}
@@ -1238,8 +1240,9 @@
axiom_node_t *ret_node = NULL;
axutil_array_list_t *topic_list = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Start:savan_util_get_topic_list_from_remote_subs_mgr");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Entry:savan_util_get_topic_list_from_remote_subs_mgr");
+
if(!s_client)
{
svc_client = (axis2_svc_client_t *) savan_util_get_svc_client(env);
@@ -1269,8 +1272,8 @@
{
/*axis2_svc_client_free(svc_client, env);*/
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] End:savan_util_get_topic_list_from_remote_subs_mgr");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
+ "[savan] Exit:savan_util_get_topic_list_from_remote_subs_mgr");
return topic_list;
}
@@ -1289,7 +1292,7 @@
if (om_str)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Sending topics_request_om_payload: %s", om_str);
+ "[savan] Sending topics_request_om_payload: %s", om_str);
AXIS2_FREE(env->allocator, om_str);
om_str = NULL;
}
@@ -1306,22 +1309,22 @@
axutil_qname_t *qname = NULL;
axutil_array_list_t *topic_list = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Start:process_topic_list_node");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:process_topic_list_node");
+
topic_list_element = axiom_node_get_data_element(topic_list_node, env);
/* Get topic elements from topic list */
- qname = axutil_qname_create(env, ELEM_NAME_TOPIC, SAVAN_NAMESPACE,
- NULL);
- topic_iter = axiom_element_get_children_with_qname(topic_list_element, env,
- qname, topic_list_node);
+ qname = axutil_qname_create(env, ELEM_NAME_TOPIC, SAVAN_NAMESPACE, NULL);
+ topic_iter = axiom_element_get_children_with_qname(topic_list_element,
env, qname,
+ topic_list_node);
+
axutil_qname_free(qname, env);
if(!topic_iter)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Topic list is empty");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Topic list is empty");
return NULL;
}
+
if(axiom_children_qname_iterator_has_next(topic_iter, env))
{
topic_list = axutil_array_list_create(env, 0);
@@ -1338,14 +1341,12 @@
{
topic_elem = axiom_node_get_data_element(topic_node, env);
topic_url_str = axiom_element_get_text(topic_elem, env,
topic_node);
- axutil_array_list_add(topic_list, env, axutil_strdup(env,
- topic_url_str));
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "topic_url_str:%s",
- topic_url_str);
+ axutil_array_list_add(topic_list, env, axutil_strdup(env,
topic_url_str));
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "topic_url_str:%s",
topic_url_str);
}
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] End:process_topic_list_node");
+
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:process_topic_list_node");
return topic_list;
}
@@ -1359,7 +1360,10 @@
client_home = AXIS2_GETENV("AXIS2C_HOME");
if (!client_home)
+ {
client_home = "../../deploy";
+ }
+
options = axis2_options_create(env);
axis2_options_set_xml_parser_reset(options, env, AXIS2_FALSE);
svc_client = axis2_svc_client_create(env, client_home);
