Author: damitha
Date: Thu Nov 6 03:36:07 2008
New Revision: 711844
URL: http://svn.apache.org/viewvc?rev=711844&view=rev
Log:
Refactoring Savan. Devide subscribers Topic field into to as Topic name and
Topic url
Modified:
webservices/savan/trunk/c/include/savan_subscriber.h
webservices/savan/trunk/c/src/client/savan_publishing_client.c
webservices/savan/trunk/c/src/core/savan_sub_processor.c
webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c
webservices/savan/trunk/c/src/subscribers/savan_subscriber.c
webservices/savan/trunk/c/src/util/db_mgr.c
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/include/savan_subscriber.h
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_subscriber.h?rev=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_subscriber.h (original)
+++ webservices/savan/trunk/c/include/savan_subscriber.h Thu Nov 6 03:36:07
2008
@@ -283,13 +283,13 @@
const axutil_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- savan_subscriber_set_topic(
+ savan_subscriber_set_topic_name(
savan_subscriber_t *subscriber,
const axutil_env_t *env,
- axis2_char_t *topic);
+ axis2_char_t *topic_name);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- savan_subscriber_get_topic(
+ savan_subscriber_get_topic_name(
savan_subscriber_t *subscriber,
const axutil_env_t *env);
@@ -304,6 +304,16 @@
savan_subscriber_t *subscriber,
const axutil_env_t *env);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ savan_subscriber_set_topic_url(
+ savan_subscriber_t *subscriber,
+ const axutil_env_t *env,
+ axis2_char_t *topic_url);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ savan_subscriber_get_topic_url(
+ savan_subscriber_t *subscriber,
+ const axutil_env_t *env);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/savan/trunk/c/src/client/savan_publishing_client.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/savan_publishing_client.c?rev=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Thu Nov 6
03:36:07 2008
@@ -83,7 +83,7 @@
axis2_char_t *topic_url = NULL;
axutil_qname_t *qname = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan]
Start:savan_publishing_client_publish");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_publishing_client_publish");
conf = client->conf;
pubs_svc = client->svc;
@@ -110,6 +110,8 @@
axis2_svc_client_t* svc_client = NULL;
axutil_param_t *svc_client_param = NULL;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[savan] Using remote subscription manager to retrieve subscribers
for %s", topic_url);
subs_mgr_url = axutil_param_get_value(param, env);
svc_client_param = axis2_svc_get_param(pubs_svc, env,
SAVAN_SVC_CLIENT);
if(svc_client_param)
@@ -132,12 +134,16 @@
axis2_char_t sql_retrieve[256];
axis2_char_t *topic_name = NULL;
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[savan] Using local subscription manager to retrieve subscribers
for %s", topic_url);
+
topic_name = savan_util_get_topic_name_from_topic_url(env, topic_url);
sprintf(sql_retrieve, "select id, end_to, notify_to, delivery_mode, "\
"expires, filter, renewed, topic_url from subscriber, topic"\
" where topic.topic_name=subscriber.topic_name and"\
" topic.topic_name='%s';", topic_name);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] sql_retrieve:%s",
sql_retrieve);
subs_store = savan_db_mgr_retrieve_all(env, savan_util_get_dbname(env,
conf),
savan_db_mgr_subs_find_callback,
sql_retrieve);
@@ -180,7 +186,7 @@
}
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan]
End:savan_publishing_client_publish");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_publishing_client_publish");
return AXIS2_SUCCESS;
}
Modified: webservices/savan/trunk/c/src/core/savan_sub_processor.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/savan_sub_processor.c?rev=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/savan_sub_processor.c (original)
+++ webservices/savan/trunk/c/src/core/savan_sub_processor.c Thu Nov 6
03:36:07 2008
@@ -272,7 +272,7 @@
axiom_node_t *sub_node = NULL;
axiom_element_t *body_elem = NULL;
axiom_element_t *sub_elem = NULL;
- axis2_char_t *topic = NULL;
+ axis2_char_t *topic_url = NULL;
axis2_endpoint_ref_t *topic_epr = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
@@ -336,13 +336,12 @@
topic_epr = axis2_msg_ctx_get_to(msg_ctx, env);
if(topic_epr)
{
- topic = (axis2_char_t *)axis2_endpoint_ref_get_address(topic_epr,
- env);
+ topic_url = (axis2_char_t *)axis2_endpoint_ref_get_address(topic_epr,
env);
}
- if(topic)
+ if(topic_url)
{
- savan_subscriber_set_topic(subscriber, env, topic);
+ savan_subscriber_set_topic_url(subscriber, env, topic_url);
}
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
Modified: webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c?rev=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c Thu Nov 6 03:36:07 2008
@@ -37,7 +37,6 @@
axis2_conf_t *conf = NULL;
savan_subscriber_t *subscriber = NULL;
axis2_char_t *topic_url = NULL;
- axis2_char_t *topic = NULL;
axis2_status_t status = AXIS2_SUCCESS;
axutil_qname_t *qname = NULL;
@@ -73,10 +72,9 @@
topic_url = axiom_element_get_text(topic_elem, env, topic_node);
if(topic_url)
{
- savan_subscriber_set_topic(subscriber, env, topic_url);
+ savan_subscriber_set_topic_url(subscriber, env, topic_url);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[savan] Subscriber will be added to the topic:%s ", topic_url);
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
}
/* Get Id element from AddSubscriber*/
@@ -129,7 +127,6 @@
axiom_node_t *remove_sub_node,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_char_t *topic = NULL;
axis2_char_t *topic_url = NULL;
axutil_qname_t *qname = NULL;
@@ -161,9 +158,8 @@
qname, remove_sub_node, &topic_node);
axutil_qname_free(qname, env);
topic_url = axiom_element_get_text(topic_elem, env, topic_node);
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[savan] Subscriber will be removed from the topic:%s ", topic);
+ "[savan] Subscriber will be removed from the topic:%s ", topic_url);
/* Get Id element from RemoveSubscriber*/
qname = axutil_qname_create(env, ELEM_NAME_ID, SAVAN_NAMESPACE, NULL);
@@ -287,7 +283,7 @@
axis2_msg_ctx_t *msg_ctx)
{
axis2_char_t *topic_url = NULL;
- axis2_char_t *topic = NULL;
+ axis2_char_t *topic_name = NULL;
axutil_array_list_t *subs_store = NULL;
axiom_namespace_t *ns1 = NULL;
axiom_node_t *subs_list_node = NULL;
@@ -346,8 +342,8 @@
if (topic_text && axiom_text_get_value(topic_text , env))
{
topic_url = (axis2_char_t *)axiom_text_get_value(topic_text, env);
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Requested
Topic:%s", topic);
+ topic_name = savan_util_get_topic_name_from_topic_url(env,
topic_url);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Requested
Topic:%s", topic_name);
}
}
else
@@ -361,7 +357,7 @@
sprintf(sql_retrieve, "select id, end_to, notify_to, delivery_mode, "\
"expires, filter, topic_url, renewed from subscriber, topic where "\
"subscriber.topic_name=topic.topic_name and topic.topic_name='%s';",
- topic);
+ topic_name);
subs_store = savan_db_mgr_retrieve_all(env, savan_util_get_dbname(env,
conf),
savan_db_mgr_subs_find_callback, sql_retrieve);
Modified: webservices/savan/trunk/c/src/subscribers/savan_subscriber.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subscribers/savan_subscriber.c?rev=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subscribers/savan_subscriber.c (original)
+++ webservices/savan/trunk/c/src/subscribers/savan_subscriber.c Thu Nov 6
03:36:07 2008
@@ -35,7 +35,8 @@
axis2_char_t *delivery_mode;
axis2_char_t *expires;
axis2_char_t *filter;
- axis2_char_t *topic;
+ axis2_char_t *topic_name;
+ axis2_char_t *topic_url;
axis2_bool_t renewed;
axis2_char_t *filter_dialect;
@@ -66,7 +67,8 @@
subscriber->expires = NULL;
subscriber->filter = NULL;
subscriber->filter_dialect = NULL;
- subscriber->topic = NULL;
+ subscriber->topic_name = NULL;
+ subscriber->topic_url = NULL;
subscriber->renewed = AXIS2_FALSE;
#ifdef SAVAN_FILTERING
subscriber->xslt_filter = NULL;
@@ -110,9 +112,14 @@
AXIS2_FREE(env->allocator, subscriber->filter);
}
- if(subscriber->topic)
+ if(subscriber->topic_name)
{
- AXIS2_FREE(env->allocator, subscriber->topic);
+ AXIS2_FREE(env->allocator, subscriber->topic_name);
+ }
+
+ if(subscriber->topic_url)
+ {
+ AXIS2_FREE(env->allocator, subscriber->topic_url);
}
#ifdef SAVAN_FILTERING
@@ -192,9 +199,13 @@
savan_subscriber_t *subscriber,
const axutil_env_t *env)
{
+ axis2_char_t *filter_template_path = NULL;
+
#ifdef SAVAN_FILTERING
- return subscriber->filter_template_path;
+ filter_template_path = subscriber->filter_template_path;
#endif
+
+ return filter_template_path;
}
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
@@ -465,22 +476,44 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-savan_subscriber_set_topic(
+savan_subscriber_set_topic_name(
savan_subscriber_t *subscriber,
const axutil_env_t *env,
- axis2_char_t *topic)
+ axis2_char_t *topic_name)
{
- subscriber->topic = axutil_strdup(env, topic);
+ subscriber->topic_name = axutil_strdup(env, topic_name);
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-savan_subscriber_get_topic(
+savan_subscriber_get_topic_name(
savan_subscriber_t *subscriber,
const axutil_env_t *env)
{
- return subscriber->topic;
+ return subscriber->topic_name;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+savan_subscriber_set_topic_url(
+ savan_subscriber_t *subscriber,
+ const axutil_env_t *env,
+ axis2_char_t *topic_url)
+{
+ subscriber->topic_url = axutil_strdup(env, topic_url);
+ if(!subscriber->topic_name)
+ {
+ subscriber->topic_name = savan_util_get_topic_name_from_topic_url(env,
topic_url);
+ }
+
+ return AXIS2_SUCCESS;
}
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+savan_subscriber_get_topic_url(
+ savan_subscriber_t *subscriber,
+ const axutil_env_t *env)
+{
+ return subscriber->topic_url;
+}
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=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/db_mgr.c (original)
+++ webservices/savan/trunk/c/src/util/db_mgr.c Thu Nov 6 03:36:07 2008
@@ -189,7 +189,7 @@
if(0 == axutil_strcmp(col_name[i], "topic_url") )
{
- savan_subscriber_set_topic(subscriber, env, argv[i]);
+ savan_subscriber_set_topic_url(subscriber, env, argv[i]);
}
if(0 == axutil_strcmp(col_name[i], "renewed") )
@@ -273,7 +273,7 @@
if(0 == axutil_strcmp(col_name[i], "topic_url"))
{
- savan_subscriber_set_topic(subscriber, env, argv[i]);
+ savan_subscriber_set_topic_url(subscriber, env, argv[i]);
}
if(0 == axutil_strcmp(col_name[i], "renewed"))
@@ -301,7 +301,7 @@
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_name = NULL;
int renewed = 0;
axis2_endpoint_ref_t *endto_epr = NULL;
axis2_endpoint_ref_t *notifyto_epr = NULL;
@@ -359,10 +359,9 @@
sprintf(sql_insert, "%s%s", sql_insert, ",filter");
counter++;
}
- topic = savan_subscriber_get_topic(subscriber, env);
- if(topic)
+ topic_name = savan_subscriber_get_topic_name(subscriber, env);
+ if(topic_name)
{
- /*topic = savan_util_get_topic_name_from_topic_url(env,
topic_url);*/
sprintf(sql_insert, "%s%s", sql_insert, ",topic_name");
counter++;
}
@@ -446,11 +445,11 @@
"[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
}
}
- if(topic)
+ if(topic_name)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] topic:%s", topic);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] topic_name:%s",
topic_name);
counter++;
- if (sqlite3_bind_text(insertqry, counter, topic, strlen(topic),
SQLITE_STATIC))
+ if (sqlite3_bind_text(insertqry, counter, topic_name,
strlen(topic_name), SQLITE_STATIC))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[savan] Sql Insert Error: %s", sqlite3_errmsg(dbconn));
@@ -496,8 +495,7 @@
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_char_t *topic_name = NULL;
int renewed = 0;
axis2_endpoint_ref_t *endto_epr = NULL;
axis2_endpoint_ref_t *notifyto_epr = NULL;
@@ -556,10 +554,9 @@
counter++;
}
- topic_url = savan_subscriber_get_topic(subscriber, env);
- if(topic_url)
+ topic_name = savan_subscriber_get_topic_name(subscriber, env);
+ if(topic_name)
{
- topic = savan_util_get_topic_name_from_topic_url(env, topic_url);
sprintf(sql_update, "%s%s", sql_update, "topic_name=?, ");
counter++;
}
@@ -637,11 +634,11 @@
}
}
- if(topic)
+ if(topic_name)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] topic:%s", topic);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] topic_name:%s",
topic_name);
counter++;
- if (sqlite3_bind_text(updateqry, counter, topic, strlen(topic),
SQLITE_STATIC))
+ if (sqlite3_bind_text(updateqry, counter, topic_name,
strlen(topic_name), SQLITE_STATIC))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[savan] Sql Update Error: %s", sqlite3_errmsg(dbconn));
@@ -1133,8 +1130,7 @@
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_char_t *topic_name = NULL;
axis2_bool_t renewed = AXIS2_FALSE;
axis2_endpoint_ref_t *endto_epr = NULL;
axis2_endpoint_ref_t *notifyto_epr = NULL;
@@ -1148,18 +1144,17 @@
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);
- if(topic_url)
+ topic_name = savan_subscriber_get_topic_name(subscriber, env);
+ if(topic_name)
{
- 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);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "topic_url:%s", topic_name);
}
renewed = savan_subscriber_get_renew_status(subscriber, env);
sprintf(sql_update, "update subscriber set end_to='%s', notify_to='%s',"\
"delivery_mode='%s', expires='%s', filter='%s', topic_name='%s',
renewed=%d"\
- " where id='%s'", endto, notifyto, delivery_mode, expires, filter,
topic,
+ " where id='%s'", endto, notifyto, delivery_mode, expires, filter,
topic_name,
renewed, id);
return sql_update;
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=711844&r1=711843&r2=711844&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Thu Nov 6 03:36:07 2008
@@ -457,21 +457,18 @@
axutil_param_t *param = NULL;
axis2_endpoint_ref_t *topic_epr = NULL;
axis2_char_t *topic_url = NULL;
- axis2_char_t *topic = NULL;
axis2_status_t status = AXIS2_FAILURE;
axutil_qname_t *qname = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_util_add_subscriber");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
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);
+ topic_url = (axis2_char_t *) axis2_endpoint_ref_get_address(topic_epr,
env);
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);
+ "[savan] Failed to extract the %s publisher service", topic_url);
return AXIS2_FAILURE;
}
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -727,7 +724,7 @@
axis2_char_t *id = NULL;
axiom_node_t *topic_node = NULL;
axiom_element_t *topic_elem = NULL;
- axis2_char_t *topic = NULL;
+ axis2_char_t *topic_url = NULL;
savan_subscriber_t *subscriber = NULL;
axis2_status_t status = AXIS2_SUCCESS;
@@ -758,9 +755,9 @@
qname = axutil_qname_create(env, ELEM_NAME_TOPIC, SAVAN_NAMESPACE, NULL);
topic_elem = axiom_element_get_first_child_with_qname(subs_elem, env,
qname, subs_node, &topic_node);
axutil_qname_free(qname, env);
- topic = axiom_element_get_text(topic_elem, env, topic_node);
- savan_subscriber_set_topic(subscriber, env, topic);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Received subscriber
topic:%s", topic);
+ topic_url = axiom_element_get_text(topic_elem, env, topic_node);
+ savan_subscriber_set_topic_url(subscriber, env, topic_url);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Received subscriber
topic:%s", topic_url);
qname = axutil_qname_create(env, ELEM_NAME_SUBSCRIBE, EVENTING_NAMESPACE,
NULL);
sub_elem = axiom_element_get_first_child_with_qname(subs_elem, env, qname,
subs_node, &sub_node);
@@ -940,7 +937,7 @@
const axis2_char_t *notify = NULL;
axis2_char_t *filter = NULL;
const axis2_char_t *expires = NULL;
- axis2_char_t *topic = NULL;
+ axis2_char_t *topic_url = NULL;
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);
@@ -972,10 +969,10 @@
}
/* create the topic element */
topic_elem = axiom_element_create(env, add_node, ELEM_NAME_TOPIC, ns1,
&topic_node);
- topic = savan_subscriber_get_topic(subscriber, env);
- if(topic)
+ topic_url = savan_subscriber_get_topic_url(subscriber, env);
+ if(topic_url)
{
- axiom_element_set_text(topic_elem, env, topic, topic_node);
+ axiom_element_set_text(topic_elem, env, topic_url, topic_node);
}
/* create the subscriber element */
@@ -1067,7 +1064,7 @@
axis2_char_t *topic = NULL;
axis2_char_t *temp = NULL;
- temp = axutil_rindex(topic_url, '/') + 1;
+ temp = axutil_rindex(topic_url, AXIS2_PATH_SEP_CHAR) + 1;
if(temp)
{
if(axutil_strchr(temp, '"'))
@@ -1502,7 +1499,7 @@
axiom_element_t* id_elem = NULL;
axiom_element_t* topic_elem = NULL;
axis2_char_t *id = NULL;
- axis2_char_t *topic = NULL;
+ axis2_char_t *topic_url = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[savan] Entry:savan_util_create_savan_specific_subscriber_node");
@@ -1533,11 +1530,11 @@
id_elem = axiom_element_create(env, subs_node, ELEM_NAME_ID, ns2,
&id_node);
axiom_element_set_text(id_elem, env, id, id_node);
- /* Topic element */
- topic = savan_subscriber_get_topic(subscriber, env);
+ /* Topic Url element */
+ topic_url = savan_subscriber_get_topic_url(subscriber, env);
ns3 = axiom_namespace_create (env, SAVAN_NAMESPACE, SAVAN_NS_PREFIX);
topic_elem = axiom_element_create(env, subs_node, ELEM_NAME_TOPIC, ns3,
&topic_node);
- axiom_element_set_text(topic_elem, env, topic, topic_node);
+ axiom_element_set_text(topic_elem, env, topic_url, topic_node);
sub_node = savan_util_create_subscriber_node(env, subscriber, subs_node);
if(!sub_node)
