Timer related items are recovered. Double quotations around comparison string are...

Change-Id: I21af99d64aaace06bc3e51626ef938ba4206e2a0
Signed-off-by: Somin Kim <somin926.kim@samsung.com>

diff --git a/src/context_trigger/context_monitor.cpp b/src/context_trigger/context_monitor.cpp
index dcd1369401912b20d4b26fbd428d95ea2d4a36bb..cb32faf7a7629edc50a8a04ad6b00992eb7a5d8f 100644 (file)
--- a/src/context_trigger/context_monitor.cpp
+++ b/src/context_trigger/context_monitor.cpp
@@ -53,8 +53,8 @@ bool ctx::context_monitor::init(ctx::context_manager_impl* ctx_mgr)
 {
        _context_mgr = ctx_mgr;
 
-/*     timer = new(std::nothrow) trigger_timer(_trigger);      TODO
-       IF_FAIL_RETURN_TAG(timer, false, _E, "Memory allocation failed");*/
+       timer = new(std::nothrow) trigger_timer();
+       IF_FAIL_RETURN_TAG(timer, false, _E, "Memory allocation failed");
 
        return true;
 }
@@ -63,8 +63,7 @@ int ctx::context_monitor::subscribe(int rule_id, std::string subject, ctx::json
 {
        if (subject.compare(TIMER_EVENT_SUBJECT) == 0) {
                // option is event json in case of ON_TIME
-//             return timer->subscribe(event);
-               return ERR_NONE;
+               return timer->subscribe(option, listener);
        }
 
        int req_id = _subscribe(subject.c_str(), &option, listener);
@@ -106,8 +105,7 @@ int ctx::context_monitor::_subscribe(const char* subject, json* option, context_
 int ctx::context_monitor::unsubscribe(int rule_id, std::string subject, ctx::json option, context_listener_iface* listener)
 {
        if (subject.compare(TIMER_EVENT_SUBJECT) == 0) {
-//             return timer->unsubscribe(option);
-               return ERR_NONE;
+               return timer->unsubscribe(option, listener);
        }
 
        int rid = find_sub(REQ_SUBSCRIBE, subject.c_str(), &option);
@@ -136,8 +134,7 @@ void ctx::context_monitor::_unsubscribe(const char *subject, int subscription_id
 int ctx::context_monitor::read(std::string subject, json option, context_listener_iface* listener)
 {
        if (subject.compare(TIMER_CONDITION_SUBJECT) == 0) {
-//             return timer->read(result);     TODO
-               return ERR_NONE;
+               return timer->read(listener);
        }
 
        int req_id = _read(subject.c_str(), &option, listener);

diff --git a/src/context_trigger/rule.cpp b/src/context_trigger/rule.cpp
index 09d314ecd78beed2ab049702208bf408436d81ce..3b6d6ae798599a353687b72b6301eeadd17c9efe 100644 (file)
--- a/src/context_trigger/rule.cpp
+++ b/src/context_trigger/rule.cpp
@@ -19,6 +19,7 @@
 #include "action_manager.h"
 #include "rule_evaluator.h"
 #include "context_monitor.h"
+#include "timer_types.h"
 
 #define CONTEXT_RULE_EVENT "event"
 #define CONTEXT_RULE_CONDITION "condition"
@@ -69,8 +70,13 @@ ctx::trigger_rule::~trigger_rule()
 
 int ctx::trigger_rule::start(void)
 {
+       ctx::json time_option = EMPTY_JSON_OBJECT;
+       if (event->name.compare(TIMER_EVENT_SUBJECT) == 0) {
+               statement.get(NULL, CT_RULE_EVENT, &time_option);
+       }
+
        // Subscribe event
-       int error = ctx_monitor->subscribe(id, event->name, event->option, this);
+       int error = ctx_monitor->subscribe(id, event->name, (time_option == EMPTY_JSON_OBJECT)? event->option : time_option, this);
        IF_FAIL_RETURN_TAG(error == ERR_NONE, error, _E, "Failed to start rule%d", id);
 
        return error;
@@ -78,8 +84,13 @@ int ctx::trigger_rule::start(void)
 
 int ctx::trigger_rule::stop(void)
 {
+       ctx::json time_option = EMPTY_JSON_OBJECT;
+       if (event->name.compare(TIMER_EVENT_SUBJECT) == 0) {
+               statement.get(NULL, CT_RULE_EVENT, &time_option);
+       }
+
        // Unsubscribe event
-       int error = ctx_monitor->unsubscribe(id, event->name, event->option, this);
+       int error = ctx_monitor->unsubscribe(id, event->name, (time_option == EMPTY_JSON_OBJECT)? event->option : time_option, this);
        IF_FAIL_RETURN_TAG(error == ERR_NONE, error, _E, "Failed to stop rule%d", id);
 
        return error;

diff --git a/src/context_trigger/rule_manager.cpp b/src/context_trigger/rule_manager.cpp
index a4d8a44aefe18ee9e5b57105f940c39cd744c693..27c1f714ab200de3b7fe08053fcc9a5aef78156b 100644 (file)
--- a/src/context_trigger/rule_manager.cpp
+++ b/src/context_trigger/rule_manager.cpp
@@ -22,6 +22,7 @@
 #include "rule_manager.h"
 #include "context_monitor.h"
 #include "rule.h"
+#include "timer.h"
 
 #define RULE_TABLE "context_trigger_rule"
 #define TEMPLATE_TABLE "context_trigger_template"
@@ -509,6 +510,10 @@ int ctx::rule_manager::add_rule(std::string creator, const char* app_id, ctx::js
                r_record.set(NULL, "creator_app_id", app_id);
        }
        r_record.set(NULL, "description", description);
+
+       // Handle timer event
+       ctx::trigger_timer::handle_timer_event(details);
+
        r_record.set(NULL, "details", details.str());
        ret = db_manager::insert_sync(RULE_TABLE, r_record, &rid);
        IF_FAIL_RETURN_TAG(ret, ERR_OPERATION_FAILED, _E, "Insert rule to db failed");

diff --git a/src/context_trigger/timer.cpp b/src/context_trigger/timer.cpp
index c2aaf31afd47ac9041093c4e8d0e9200c529c385..98c0108fbc4d120b9b34bdf8599a785a76413a5c 100644 (file)
--- a/src/context_trigger/timer.cpp
+++ b/src/context_trigger/timer.cpp
@@ -22,8 +22,8 @@
 #include <context_mgr.h>
 #include <context_trigger_types_internal.h>
 #include "timer.h"
-#include "trigger.h"
 #include "timer_types.h"
+#include "context_listener_iface.h"
 
 #define MAX_HOUR       24
 #define MAX_DAY                7
@@ -34,7 +34,6 @@ static GMutex timer_mutex;
 static int convert_string_to_day_of_week(std::string d)
 {
        int day = 0;
-       d = d.substr(1, d.length() - 2);
 
        if (d.compare(TIMER_SUN) == 0) {
                day = SUN;
@@ -67,12 +66,12 @@ static int arrange_day_of_week(ctx::json day_info)
 
        std::string key_op;
        if (!day_info.get(NULL, CT_RULE_DATA_KEY_OPERATOR, &key_op)) {
-               result = convert_string_to_day_of_week("\"" TIMER_EVERYDAY "\"");
+               result = convert_string_to_day_of_week(TIMER_EVERYDAY);
                return result;
        }
 
        if (key_op.compare("and") == 0) {
-               result = convert_string_to_day_of_week("\"" TIMER_EVERYDAY "\"");
+               result = convert_string_to_day_of_week(TIMER_EVERYDAY);
        }
 
        std::string tmp_d;
@@ -82,7 +81,7 @@ static int arrange_day_of_week(ctx::json day_info)
                day_info.get_array_elem(NULL, CT_RULE_DATA_VALUE_OPERATOR_ARR, i, &op);
 
                if (op.compare("neq") == 0) {
-                       dow = convert_string_to_day_of_week("\"" TIMER_EVERYDAY "\"") & ~dow;
+                       dow = convert_string_to_day_of_week(TIMER_EVERYDAY) & ~dow;
                }
 
                if (key_op.compare("and") == 0) {
@@ -130,8 +129,7 @@ ctx::trigger_timer::ref_count_array_s::ref_count_array_s()
        memset(count, 0, sizeof(int) * MAX_DAY);
 }
 
-ctx::trigger_timer::trigger_timer(ctx::context_trigger* tr)
-       : trigger(tr)
+ctx::trigger_timer::trigger_timer()
 {
        submit_trigger_item();
 }
@@ -289,10 +287,13 @@ void ctx::trigger_timer::on_timer_expired(int hour, int min, int day_of_week)
        result.set(NULL, TIMER_RESPONSE_KEY_DAY_OF_WEEK, convert_day_of_week_to_string(day_of_week));
 
        ctx::json dummy = NULL;
-//     trigger->push_fact(TIMER_EVENT_REQ_ID, ERR_NONE, TIMER_EVENT_SUBJECT, dummy, result);   // TODO deliver event
+
+       for (listener_list_t::iterator it = listener_list.begin(); it != listener_list.end(); ++it) {
+               (*it)->on_event_received(TIMER_EVENT_SUBJECT, EMPTY_JSON_OBJECT, result);
+       }
 }
 
-int ctx::trigger_timer::subscribe(ctx::json option)
+int ctx::trigger_timer::subscribe(ctx::json option, context_listener_iface* listener)
 {
        ctx::json day_info;
        ctx::json time_info;
@@ -318,10 +319,12 @@ int ctx::trigger_timer::subscribe(ctx::json option)
                add(time, dow);
        }
 
+       listener_list.push_back(listener);
+
        return ERR_NONE;
 }
 
-int ctx::trigger_timer::unsubscribe(ctx::json option)
+int ctx::trigger_timer::unsubscribe(ctx::json option, context_listener_iface* listener)
 {
        ctx::json day_info;
        ctx::json time_info;
@@ -347,10 +350,12 @@ int ctx::trigger_timer::unsubscribe(ctx::json option)
                remove(time, dow);
        }
 
+       listener_list.remove(listener);
+
        return ERR_NONE;
 }
 
-int ctx::trigger_timer::read(ctx::json* result)
+int ctx::trigger_timer::read(context_listener_iface* listener)
 {
        time_t rawtime;
        struct tm timeinfo;
@@ -363,9 +368,14 @@ int ctx::trigger_timer::read(ctx::json* result)
        int minute_of_day = timeinfo.tm_hour * 60 + timeinfo.tm_min;
        std::string day_of_week = convert_day_of_week_to_string(0x01 << timeinfo.tm_wday);
 
-       (*result).set(NULL, TIMER_RESPONSE_KEY_DAY_OF_MONTH, day_of_month);
-       (*result).set(NULL, TIMER_RESPONSE_KEY_DAY_OF_WEEK, day_of_week);
-       (*result).set(NULL, TIMER_RESPONSE_KEY_TIME_OF_DAY, minute_of_day);
+       ctx::json result;
+       result.set(NULL, TIMER_RESPONSE_KEY_DAY_OF_MONTH, day_of_month);
+       result.set(NULL, TIMER_RESPONSE_KEY_DAY_OF_WEEK, day_of_week);
+       result.set(NULL, TIMER_RESPONSE_KEY_TIME_OF_DAY, minute_of_day);
+
+       _I("Time: %02d:%02d, Day of Week: %s, Day of Month: %d", timeinfo.tm_hour, timeinfo.tm_min, day_of_week.c_str(), day_of_month);
+
+       listener->on_condition_received(TIMER_CONDITION_SUBJECT, EMPTY_JSON_OBJECT, result);
 
        return ERR_NONE;
 }
@@ -374,3 +384,43 @@ bool ctx::trigger_timer::empty()
 {
        return timer_state_map.empty();
 }
+
+void ctx::trigger_timer::handle_timer_event(ctx::json& rule)
+{
+       ctx::json event;
+       rule.get(NULL, CT_RULE_EVENT, &event);
+
+       std::string e_name;
+       event.get(NULL, CT_RULE_EVENT_ITEM, &e_name);
+       if (e_name.compare(TIMER_EVENT_SUBJECT) != 0 ) {
+               return;
+       }
+
+       ctx::json day_info;
+       ctx::json it;
+       int dow;
+       for (int i = 0; event.get_array_elem(NULL, CT_RULE_DATA_ARR, i, &it); i++){
+               std::string key;
+               it.get(NULL, CT_RULE_DATA_KEY, &key);
+
+               if (key.compare(TIMER_RESPONSE_KEY_DAY_OF_WEEK) == 0) {
+                       dow = arrange_day_of_week(it);
+
+                       day_info.set(NULL, CT_RULE_DATA_KEY, TIMER_RESPONSE_KEY_DAY_OF_WEEK);
+                       day_info.set(NULL, CT_RULE_DATA_KEY_OPERATOR, "or");
+
+                       for (int j = 0; j < MAX_DAY; j++) {
+                               int d = 0x01 << j;
+                               if (dow & d) {
+                                       std::string day = convert_day_of_week_to_string(d);
+                                       day_info.array_append(NULL, CT_RULE_DATA_VALUE_ARR, day);
+                                       day_info.array_append(NULL, CT_RULE_DATA_VALUE_OPERATOR_ARR, "eq");
+                               }
+                       }
+                       event.array_set_at(NULL, CT_RULE_DATA_ARR, i, day_info);
+               }
+
+       }
+
+       rule.set(NULL, CT_RULE_EVENT, event);
+}

diff --git a/src/context_trigger/timer.h b/src/context_trigger/timer.h
index a9e183258d70f6cc7a46c84e31195d2231272b65..924a9e8b43fda59d83af3b2f8e15b1f0c24ed1eb 100644 (file)
--- a/src/context_trigger/timer.h
+++ b/src/context_trigger/timer.h
@@ -25,7 +25,7 @@
 
 namespace ctx {
 
-       class context_trigger;
+       class context_listener_iface;
 
        class trigger_timer : public timer_listener_iface {
        private:
@@ -42,10 +42,11 @@ namespace ctx {
 
                typedef std::map<int, ref_count_array_s> ref_count_map_t;
                typedef std::map<int, timer_state_s> timer_state_map_t;
+               typedef std::list<context_listener_iface*> listener_list_t;
 
-               ctx::context_trigger *trigger;
                ref_count_map_t ref_count_map;
                timer_state_map_t timer_state_map;
+               listener_list_t listener_list;
 
                bool add(int minute, int day_of_week);
                bool remove(int minute, int day_of_week);
@@ -60,13 +61,15 @@ namespace ctx {
                bool on_timer_expired(int timer_id, void *user_data);
 
        public:
-               trigger_timer(ctx::context_trigger *tr);
+               trigger_timer();
                ~trigger_timer();
                static void submit_trigger_item();
 
-               int subscribe(ctx::json option);
-               int unsubscribe(ctx::json option);
-               int read(ctx::json* result);
+               int subscribe(ctx::json option, context_listener_iface* listener);
+               int unsubscribe(ctx::json option, context_listener_iface* listener);
+               int read(context_listener_iface* listener);
+
+               static void handle_timer_event(ctx::json& rule);
        };
 
 }      /* namespace ctx */