You are viewing a plain text version of this content. The canonical link for it is here.
Posted to savan-dev@ws.apache.org by da...@apache.org on 2007/09/19 06:44:24 UTC
svn commit: r577150 - in /webservices/savan/trunk/c/src/util: db_mgr.c
savan_util.c
Author: damitha
Date: Tue Sep 18 21:44:19 2007
New Revision: 577150
URL: http://svn.apache.org/viewvc?rev=577150&view=rev
Log:
Cleaning the code
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=577150&r1=577149&r2=577150&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/db_mgr.c (original)
+++ webservices/savan/trunk/c/src/util/db_mgr.c Tue Sep 18 21:44:19 2007
@@ -759,45 +759,6 @@
}
axis2_char_t *AXIS2_CALL
-savan_db_mgr_create_insert_sql(
- const axutil_env_t *env,
- savan_subscriber_t *subscriber,
- axis2_conf_ctx_t *conf_ctx)
-{
- axis2_char_t *sql_insert = NULL;
- axis2_char_t *id = NULL;
- axis2_char_t *endto = NULL;
- axis2_char_t *notifyto = NULL;
- axis2_char_t *delivery_mode = NULL;
- axis2_char_t *expires = NULL;
- axis2_char_t *filter = NULL;
- axis2_char_t *topic = NULL;
- axis2_char_t *topic_url = NULL;
- axis2_bool_t renewed = AXIS2_FALSE;
- axis2_endpoint_ref_t *endto_epr = NULL;
- axis2_endpoint_ref_t *notifyto_epr = NULL;
- sql_insert = AXIS2_MALLOC(env->allocator, 1024);
-
- id = savan_subscriber_get_id(subscriber, env);
- 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);
- delivery_mode = savan_subscriber_get_delivery_mode(subscriber, env);
- expires = savan_subscriber_get_expires(subscriber, env);
- filter = savan_subscriber_get_filter(subscriber, env);
- topic_url = savan_subscriber_get_topic(subscriber, env);
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
- renewed = savan_subscriber_get_renew_status(subscriber, env);
- sprintf(sql_insert, "insert into subscriber(id, end_to, notify_to,"\
- "delivery_mode, expires, filter, topic_name, renewed) values('%s'"\
- ", '%s', '%s', '%s', '%s', '%s', '%s', %d);", id, endto, notifyto,
- delivery_mode, expires, filter, topic, renewed);
- return sql_insert;
-}
-
-axis2_char_t *AXIS2_CALL
savan_db_mgr_create_update_sql(
const axutil_env_t *env,
savan_subscriber_t *subscriber,
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=577150&r1=577149&r2=577150&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Tue Sep 18 21:44:19 2007
@@ -211,20 +211,14 @@
xslt_template_filter =
(xsltStylesheetPtr)savan_subscriber_get_filter_template(subscriber,
env);
- if(xslt_template_filter)
- {
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "came0");
- }
xmlDocPtr result_doc = (xmlDocPtr)xsltApplyStylesheet(xslt_template_filter,
payload_doc, NULL);
if(result_doc)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "came1");
xmlDocDumpMemory(result_doc, &buffer, &size);
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] Buffer:%s", buffer);
if(buffer)
{
reader = axiom_xml_reader_create_for_memory(env,
@@ -233,17 +227,14 @@
}
if(reader)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "came2");
om_builder = axiom_stax_builder_create(env, reader);
}
if(om_builder)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "came3");
document = axiom_stax_builder_get_document(om_builder, env);
}
if(document)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "came4");
node = axiom_document_build_all(document, env);
}
@@ -480,106 +471,6 @@
}
/******************************************************************************/
-/*
-axutil_hash_t * AXIS2_CALL
-savan_util_get_subscriber_store(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
-{
- axis2_svc_t *pubs_svc = NULL;
- axutil_param_t *param = NULL;
- axutil_hash_t *subs_store = NULL;
- axis2_char_t *subs_svc_name = NULL;
- axis2_char_t *topic = NULL;
- axis2_endpoint_ref_t *topic_epr = NULL;
- axis2_char_t *topic_url = NULL;
-
- AXIS2_ENV_CHECK(env, NULL);
-
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_get_subscriber_store");
-
- topic_epr = axis2_msg_ctx_get_to(msg_ctx, env);
- topic_url = (axis2_char_t *) axis2_endpoint_ref_get_address(topic_epr,
- env);
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
- pubs_svc = axis2_msg_ctx_get_svc(msg_ctx, env);
- if (!pubs_svc)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the %s publisher service", topic);
- return NULL;
- }
- param = axis2_svc_get_param(pubs_svc, env, "SubscriptionMgrName");
- if(param)
- {
- axis2_svc_t *subs_svc = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
- axis2_conf_t *conf = NULL;
- axutil_param_t *subs_store_param = NULL;
-
- subs_svc_name = axutil_param_get_value(param, env);
- conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- if(conf)
- subs_svc = axis2_conf_get_svc(conf, env, subs_svc_name);
- if(subs_svc)
- {
- subs_store_param = axis2_svc_get_param(subs_svc, env,
- SAVAN_SUBSCRIBER_LIST);
- if(!subs_store_param)
- {
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] No Topic found");
- return NULL;
- }
- subs_store = axutil_param_get_value(subs_store_param, env);
- }
- else
- {
- axis2_char_t *subs_mgr_url = NULL;
-
- param = axis2_svc_get_param(pubs_svc, env, "SubscriptionMgrURL");
- if(param)
- {
- axis2_svc_client_t* svc_client = NULL;
- axutil_param_t *svc_client_param = NULL;
-
- subs_mgr_url = axutil_param_get_value(param, env);
- topic_epr = axis2_msg_ctx_get_to(msg_ctx, env);
- topic_url = (axis2_char_t *) axis2_endpoint_ref_get_address(topic_epr,
- env);
- svc_client_param = axis2_svc_get_param(pubs_svc, env, "svc_client");
- if(svc_client_param)
- svc_client = axutil_param_get_value(svc_client_param, env);
- if(!svc_client)
- {
- svc_client = (axis2_svc_client_t *) savan_util_get_svc_client(env);
- svc_client_param = axutil_param_create(env, "svc_client", svc_client);
- axis2_svc_add_param(pubs_svc, env, svc_client_param);
- }
- subs_store = savan_util_get_subscriber_list_from_remote_subs_mgr(env,
- topic_url, subs_mgr_url, svc_client);
- }
- }
- }
- else
- {
- param = axis2_svc_get_param(pubs_svc, env, SAVAN_SUBSCRIBER_LIST);
- if (param)
- {
- subs_store = (axutil_hash_t*)axutil_param_get_value(param, env);
- }
- }
- if(!subs_store)
- {
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] No subscribers for topic %s found", topic);
- return NULL;
- }
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_get_subscriber_store");
- return subs_store;
-}*/
axis2_status_t AXIS2_CALL
savan_util_add_subscriber(
@@ -650,11 +541,9 @@
{
savan_db_mgr_t *db_mgr = NULL;
axis2_conf_ctx_t *conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
- axis2_char_t *sql_update = savan_db_mgr_create_update_sql(env,
- subscriber, conf_ctx);
db_mgr = savan_db_mgr_create(env, conf_ctx);
if(db_mgr)
- savan_db_mgr_update(db_mgr, env, sql_update);
+ savan_db_mgr_insert_subscriber(db_mgr, env, subscriber);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[SAVAN] End:savan_util_update_subscriber");
@@ -667,36 +556,10 @@
axis2_msg_ctx_t *msg_ctx,
savan_subscriber_t *subscriber)
{
- /*axis2_svc_t *pubs_svc = NULL;
- axutil_param_t *param = NULL;
- axis2_char_t *topic_url = NULL;
- axis2_char_t *topic = NULL;
- axis2_endpoint_ref_t *topic_epr = NULL;*/
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[SAVAN] Start:savan_util_remove_subscriber");
- /*topic_epr = axis2_msg_ctx_get_to(msg_ctx, env);
- topic_url = (axis2_char_t *) axis2_endpoint_ref_get_address(topic_epr,
- env);
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
- pubs_svc = axis2_msg_ctx_get_svc(msg_ctx, env);
- if (!pubs_svc)
- {
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the %s publisher service", topic);
- return AXIS2_FAILURE;
- }
- param = axis2_svc_get_param(pubs_svc, env, "SubscriptionMgrURL");
- if(param)
- {
- axis2_char_t *subs_mgr_url = NULL;
- subs_mgr_url = axutil_param_get_value(param, env);
- remove_subscriber_from_remote_subs_mgr(env, subscriber, subs_mgr_url);
- }
- else*/
{
axis2_char_t *subs_id = NULL;
axis2_char_t sql_remove[256];