alarm parsing bug: was set alarm to start time not alarm time

Change-Id: Ia8223faffd912ebfd441033e0efc5496218b5ccc

diff --git a/common/cal_vcalendar_parse.c b/common/cal_vcalendar_parse.c
index f257dc3..73912f1 100644 (file)
--- a/common/cal_vcalendar_parse.c
+++ b/common/cal_vcalendar_parse.c
@@ -2713,18 +2713,15 @@ static void __work_component_property_valarm_trigger(char *value, calendar_recor
                                        case VCAL_RELATED_START:
                                                ret = calendar_record_get_caltime(record, _calendar_event.start_time, &caltime);
                                                WARN_IF(CALENDAR_ERROR_NONE != ret, "calendar_record_get_caltime() Fail(%d)", ret);
-                                               cal_time_modify_caltime(&caltime, tick * unit);
-                                               ret = cal_record_set_caltime(record, _calendar_event.start_time, caltime);
-                                               WARN_IF(CALENDAR_ERROR_NONE != ret, "cal_record_set_caltime() Fail(%d)", ret);
                                                break;
                                        case VCAL_RELATED_END:
                                                ret = calendar_record_get_caltime(record, _calendar_event.end_time, &caltime);
                                                WARN_IF(CALENDAR_ERROR_NONE != ret, "calendar_record_get_caltime() Fail(%d)", ret);
-                                               cal_time_modify_caltime(&caltime, tick * unit);
-                                               ret = cal_record_set_caltime(record, _calendar_event.end_time, caltime);
-                                               WARN_IF(CALENDAR_ERROR_NONE != ret, "cal_record_set_caltime() Fail(%d)", ret);
                                                break;
                                        }
+                                       cal_time_modify_caltime(&caltime, tick * unit);
+                                       ret = cal_record_set_caltime(alarm, _calendar_alarm.alarm_time, caltime);
+                                       WARN_IF(CALENDAR_ERROR_NONE != ret, "cal_record_set_caltime() Fail(%d)", ret);
                                        ret = cal_record_set_int(alarm, _calendar_alarm.tick_unit, CALENDAR_ALARM_TIME_UNIT_SPECIFIC);
                                        WARN_IF(CALENDAR_ERROR_NONE != ret, "cal_record_set_int() Fail(%d)", ret);
                                }

diff --git a/server/cal_server_alarm.c b/server/cal_server_alarm.c
index 4521f10..51fb017 100644 (file)
--- a/server/cal_server_alarm.c
+++ b/server/cal_server_alarm.c
@@ -199,9 +199,9 @@ int cal_server_alarm_get_alert_time(int alarm_id, time_t *tt_alert)
        RETV_IF(NULL == tt_alert, CALENDAR_ERROR_INVALID_PARAMETER);
 
        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,A.alarm_utime,A.alarm_datetime,B.type,B.dtstart_type,B.dtend_type "
-                       "FROM %s as A, %s as B ON A.event_id = B.id WHERE alarm_id =%d ",
+       snprintf(query, sizeof(query), "SELECT A.event_id, A.remind_tick_unit, A.remind_tick, "
+                       "A.alarm_type, A.alarm_utime, A.alarm_datetime, B.type, B.dtstart_type, "
+                       "B.dtend_type FROM %s as A, %s as B ON A.event_id =B.id WHERE alarm_id =%d ",
                        CAL_TABLE_ALARM, CAL_TABLE_SCHEDULE, alarm_id);
 
        sqlite3_stmt *stmt = NULL;
@@ -256,8 +256,8 @@ int cal_server_alarm_get_alert_time(int alarm_id, time_t *tt_alert)
                        st.tm_hour = h;
                        st.tm_min = n;
                        st.tm_sec = s;
-                       *tt_alert = (long long int)mktime(&st);
-                       DBG("datetime[%s] to %02d:%02d:%02d (%lld)", datetime, h, n, s, *tt_alert);
+                       *tt_alert = mktime(&st);
+                       DBG("datetime[%s] to %02d:%02d:%02d (%d)", datetime, h, n, s, *tt_alert);
                }
                sqlite3_finalize(stmt);
                return CALENDAR_ERROR_NONE;
@@ -293,7 +293,7 @@ int cal_server_alarm_get_alert_time(int alarm_id, time_t *tt_alert)
                }
                break;
        }
-       DBG("alert_time(%lld) = utime(%lld) - (tick(%d) * unit(%d))", *tt_alert, utime, datetime, tick, unit);
+       DBG("alert_time(%d) = utime(%lld) - (tick(%d) * unit(%d))", *tt_alert, utime, tick, unit);
 
        *tt_alert = utime - (tick * unit);
        return CALENDAR_ERROR_NONE;