modify terminology:calendar->book,allday->localtime,normal->utime,svc->service

[platform/core/pim/calendar-service.git] / server / cal_server_alarm.c

diff --git a/server/cal_server_alarm.c b/server/cal_server_alarm.c
index 95b5388..8782700 100644 (file)
--- a/server/cal_server_alarm.c
+++ b/server/cal_server_alarm.c
@@ -132,7 +132,7 @@ static long long int _get_event_alert_utime(const char *field, int event_id, tim
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "SELECT %s FROM %s "
                        "WHERE event_id=%d AND %s>%ld ORDER BY %s LIMIT 1",
-                       field, CAL_TABLE_NORMAL_INSTANCE, event_id, field, current, field);
+                       field, CAL_TABLE_UTIME_INSTANCE, event_id, field, current, field);
 
        sqlite3_stmt *stmt = NULL;
        ret = cal_db_util_query_prepare(query, &stmt);
@@ -162,7 +162,7 @@ static int _get_event_alert_localtime(const char *field, int event_id, time_t cu
        time_t mod_current = timegm(&st);
        snprintf(query, sizeof(query), "SELECT %s FROM %s "
                        "WHERE event_id=%d AND strftime('%%s', %s)>%ld ORDER BY %s LIMIT 1",
-                       field, CAL_TABLE_ALLDAY_INSTANCE, event_id, field, mod_current, field);
+                       field, CAL_TABLE_LOCALTIME_INSTANCE, event_id, field, mod_current, field);
 
        sqlite3_stmt *stmt = NULL;
        ret = cal_db_util_query_prepare(query, &stmt);
@@ -517,14 +517,14 @@ static void _cal_server_alarm_get_upcoming_nonspecific_event_utime(time_t utime,
        int ret = 0;
        /*
         * A:alarm
-        * B:normal instance
+        * B:utime
         */
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "SELECT A.event_id,A.remind_tick_unit,A.remind_tick, "
                        "A.alarm_type,B.dtstart_utime,A.alarm_datetime "
                        "FROM %s as A, %s as B ON A.event_id = B.event_id "
                        "WHERE A.remind_tick_unit >%d AND (B.dtstart_utime - (A.remind_tick_unit * A.remind_tick)) %s %ld %s",
-                       CAL_TABLE_ALARM, CAL_TABLE_NORMAL_INSTANCE, CALENDAR_ALARM_TIME_UNIT_SPECIFIC,
+                       CAL_TABLE_ALARM, CAL_TABLE_UTIME_INSTANCE, CALENDAR_ALARM_TIME_UNIT_SPECIFIC,
                        true == get_all ? "=" : ">", utime,
                        true == get_all ? "" : "ORDER BY (B.dtstart_utime - (A.remind_tick_unit * A.remind_tick)) LIMIT 1");
 
@@ -569,7 +569,7 @@ static void _cal_server_alarm_get_upcoming_nonspecific_event_localtime(const cha
        int ret = 0;
        /*
         * A:alarm
-        * B:allday
+        * B:localtime
         */
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "SELECT A.event_id,A.remind_tick_unit,A.remind_tick, "
@@ -577,7 +577,7 @@ static void _cal_server_alarm_get_upcoming_nonspecific_event_localtime(const cha
                        "FROM %s as A, %s as B ON A.event_id = B.event_id "
                        "WHERE A.remind_tick_unit >%d AND "
                        "(strftime('%%s', B.dtstart_datetime) - (A.remind_tick_unit * A.remind_tick) - strftime('%%s', '%s') %s 0) %s",
-                       CAL_TABLE_ALARM, CAL_TABLE_ALLDAY_INSTANCE, CALENDAR_ALARM_TIME_UNIT_SPECIFIC,
+                       CAL_TABLE_ALARM, CAL_TABLE_LOCALTIME_INSTANCE, CALENDAR_ALARM_TIME_UNIT_SPECIFIC,
                        datetime, true == get_all ? "=" : ">",
                        true == get_all ? "" : "ORDER BY (strftime('%s', B.dtstart_datetime) - (A.remind_tick_unit * A.remind_tick)) LIMIT 1 ");
        sqlite3_stmt *stmt = NULL;
@@ -632,7 +632,7 @@ static void _cal_server_alarm_get_upcoming_nonspecific_todo_utime(time_t utime,
        int ret = 0;
        /*
         * A:alarm
-        * B:todo(normal)
+        * B:todo(utime)
         */
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "SELECT A.event_id,A.remind_tick_unit,A.remind_tick,"
@@ -686,7 +686,7 @@ static void _cal_server_alarm_get_upcoming_nonspecific_todo_localtime(const char
        int ret = 0;
        /*
         * A:alarm
-        * B:todo(allday)
+        * B:todo(localtime)
         */
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "SELECT A.event_id,A.remind_tick_unit,A.remind_tick,"
@@ -1141,15 +1141,15 @@ static void _changed_cb(const char* view_uri, void* data)
 
 static int _cal_server_alarm_set_inotify(calendar_db_changed_cb callback)
 {
-       cal_inotify_subscribe(CAL_NOTI_TYPE_EVENT, CAL_NOTI_EVENT_CHANGED, callback, NULL);
-       cal_inotify_subscribe(CAL_NOTI_TYPE_TODO, CAL_NOTI_TODO_CHANGED, callback, NULL);
+       cal_inotify_subscribe(CAL_NOTI_TYPE_EVENT, CAL_NOTI_FILE_EVENT, callback, NULL);
+       cal_inotify_subscribe(CAL_NOTI_TYPE_TODO, CAL_NOTI_FILE_TODO, callback, NULL);
        return 0;
 }
 
 static void _cal_server_alarm_unset_inotify(calendar_db_changed_cb callback)
 {
-       cal_inotify_unsubscribe(CAL_NOTI_EVENT_CHANGED, callback, NULL);
-       cal_inotify_unsubscribe(CAL_NOTI_TODO_CHANGED, callback, NULL);
+       cal_inotify_unsubscribe(CAL_NOTI_FILE_EVENT, callback, NULL);
+       cal_inotify_unsubscribe(CAL_NOTI_FILE_TODO, callback, NULL);
 }
 
 int cal_server_alarm_init(void)