Modify for Related Topic.
[platform/upstream/iotivity.git] / service / notification / src / provider / NSProviderTopic.c
index e0193e1..947a15f 100644 (file)
@@ -288,11 +288,6 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest)
     return NS_OK;\r
 }\r
 \r
-bool NSIsTopicSubscribed(char * consumerId, char * topic)\r
-{\r
-    return NSProviderIsTopicSubScribed(consumerTopicList->head, consumerId, topic);\r
-}\r
-\r
 NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest)\r
 {\r
     NS_LOG(DEBUG, "NSPostConsumerTopics() - IN");\r
@@ -373,10 +368,10 @@ void * NSTopicSchedule(void * ptr)
                     NSStorageWrite(consumerTopicList, newObj);\r
                     break;\r
                 case TASK_UNSUBSCRIBE_TOPIC:\r
-                    consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID;\r
-                    NSStorageDelete(consumerTopicList, (const char *) node->taskData);\r
-                    consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME;\r
-                    OICFree((char *)node->taskData);\r
+                    NS_LOG(DEBUG, "CASE TASK_SUBSCRIBE_TOPIC : ");\r
+                    NSProviderDeleteConsumerTopic(consumerTopicList,\r
+                            (NSCacheTopicSubData *) node->taskData);\r
+                    NS_LOG(DEBUG, "CASE TASK_SUBSCRIBE_TOPIC AFter: ");\r
                     break;\r
                 case TASK_ADD_TOPIC:\r
                 {\r