return CALENDAR_ERROR_NONE;
}
+static time_t _make_time(struct tm *time)
+{
+ time_t utc = mktime(time);
+
+ /* If an error occurs when isdst is 1, retry it after chaning isdst is 0 */
+ if (utc < 0 && time->tm_isdst != 0 ) {
+ time->tm_isdst = 0;
+ utc = mktime(time);
+ }
+ return utc;
+}
+
static long long int _get_event_alert_utime(const char *field, int event_id, time_t current)
{
int ret = 0;
int ret = 0;
char query[CAL_DB_SQL_MAX_LEN] = {0};
struct tm st = {0};
- tzset();
- localtime_r(¤t, &st);
- time_t mod_current = timegm(&st);
+ struct tm now_s = {0};
+ char buf[256] = {0};
+
+ localtime_r(¤t, &now_s);
+ snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d", (int)(now_s.tm_year + 1900),
+ (int)(now_s.tm_mon + 1), (int)now_s.tm_mday, (int)now_s.tm_hour,
+ (int)now_s.tm_min, (int)now_s.tm_sec);
+ DBG("Current time : (%s)", buf);
+
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_LOCALTIME_INSTANCE, event_id, field, mod_current, field);
+ "WHERE event_id=%d AND (strftime('%%s', %s) - strftime('%%s', '%s') > 0) ORDER BY %s LIMIT 1",
+ field, CAL_TABLE_LOCALTIME_INSTANCE, event_id, field, buf, field);
sqlite3_stmt *stmt = NULL;
ret = cal_db_util_query_prepare(query, &stmt);
if (CAL_SQLITE_ROW == cal_db_util_stmt_step(stmt))
datetime = (const char *)sqlite3_column_text(stmt, 0);
+
if (NULL == datetime || '\0' == *datetime) {
/* LCOV_EXCL_START */
ERR("Invalid datetime [%s]", datetime);
st.tm_hour = h;
st.tm_min = n;
st.tm_sec = s;
+ st.tm_isdst = cal_time_is_dst_savings();
- return (long long int)mktime(&st);
+ return (long long int)_make_time(&st);
}
static int64_t _get_todo_alert_utime(const char *field, int id, time_t now_t)
case CAL_SQLITE_ROW:
utime = (int64_t)sqlite3_column_int64(stmt, 0);
break;
- /* LCOV_EXCL_START */
+ /* LCOV_EXCL_START
case SQLITE_DONE:
ERR("No data");
- break;
+ break;*/ //Svace:371986
default:
ERR("Invalid return(%d)", ret);
break;
int ret = 0;
char query[CAL_DB_SQL_MAX_LEN] = {0};
struct tm st = {0};
- tzset();
- localtime_r(¤t, &st);
- time_t mod_current = timegm(&st);
+ struct tm now_s = {0};
+ char buf[256] = {0};
+
+ localtime_r(¤t, &now_s);
+ snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d", (int)(now_s.tm_year + 1900),
+ (int)(now_s.tm_mon + 1), (int)now_s.tm_mday, (int)now_s.tm_hour,
+ (int)now_s.tm_min, (int)now_s.tm_sec);
+ DBG("Current time : (%s)", buf);
+
snprintf(query, sizeof(query), "SELECT %s FROM %s "
- "WHERE id=%d AND strftime('%%s', %s)>%ld ORDER BY %s LIMIT 1",
- field, CAL_TABLE_SCHEDULE, event_id, field, mod_current, field);
+ "WHERE id=%d AND (strftime('%%s', %s) - strftime('%%s', '%s') > 0) ORDER BY %s LIMIT 1",
+ field, CAL_TABLE_SCHEDULE, event_id, field, buf, field);
sqlite3_stmt *stmt = NULL;
ret = cal_db_util_query_prepare(query, &stmt);
st.tm_hour = h;
st.tm_min = n;
st.tm_sec = s;
+ st.tm_isdst = cal_time_is_dst_savings();
- return (long long int)mktime(&st);
+ return (long long int)_make_time(&st);
}
/*
* time(NULL) is not appropriate as parameter.
dtend_type = sqlite3_column_int(stmt, 8);
}
- if (NULL == tt_alert) {
- /* LCOV_EXCL_START */
- ERR("Invalid parameter: tt_alert is NULL");
- sqlite3_finalize(stmt);
- return CALENDAR_ERROR_INVALID_PARAMETER;
- /* LCOV_EXCL_STOP */
- }
-
if (CALENDAR_ALARM_TIME_UNIT_SPECIFIC == unit) {
if (CALENDAR_TIME_UTIME == type) {
*tt_alert = utime;
st.tm_hour = h;
st.tm_min = n;
st.tm_sec = s;
- *tt_alert = mktime(&st);
- DBG("datetime[%s] to %02d:%02d:%02d (%d)", datetime, h, n, s, *tt_alert);
+ st.tm_isdst = cal_time_is_dst_savings();
+ *tt_alert = _make_time(&st);
+ DBG("datetime[%s] to %02d:%02d:%02d (%ld)", datetime, h, n, s, *tt_alert);
}
}
sqlite3_finalize(stmt);
sqlite3_finalize(stmt);
time_t current = time(NULL);
+
current += (tick * unit);
current -= 2; /* in case time passed */
}
break;
}
- DBG("alert_time(%d) = utime(%lld) - (tick(%d) * unit(%d))", *tt_alert, utime, tick, unit);
-
*tt_alert = utime - (tick * unit);
+
+ DBG("alert_time(%ld) = utime(%lld) - (tick(%d) * unit(%d))", *tt_alert, utime, tick, unit);
+
return CALENDAR_ERROR_NONE;
}
{
int ret = 0;
char query[CAL_DB_SQL_MAX_LEN] = {0};
- snprintf(query, sizeof(query), "SELECT event_id,remind_tick_unit,remind_tick,"
- "alarm_type,alarm_utime,alarm_datetime "
- "FROM %s WHERE remind_tick_unit =%d AND alarm_type =%d AND alarm_utime %s %ld %s",
- CAL_TABLE_ALARM, CALENDAR_ALARM_TIME_UNIT_SPECIFIC, CALENDAR_TIME_UTIME,
+ snprintf(query, sizeof(query), "SELECT A.event_id, A.remind_tick_unit, A.remind_tick,"
+ "A.alarm_type, A.alarm_utime, A.alarm_datetime "
+ "FROM "CAL_TABLE_ALARM" as A, "CAL_TABLE_SCHEDULE" as S ON A.event_id = S.id "
+ "WHERE S.link_base_id = 0 AND A.remind_tick_unit = %d AND A.alarm_type = %d "
+ "AND A.alarm_utime %s %ld %s",
+ CALENDAR_ALARM_TIME_UNIT_SPECIFIC, CALENDAR_TIME_UTIME,
true == get_all ? "=" : ">", utime,
true == get_all ? "" : "ORDER BY alarm_utime ASC LIMIT 1");
{
int ret = 0;
char query[CAL_DB_SQL_MAX_LEN] = {0};
- snprintf(query, sizeof(query), "SELECT event_id,remind_tick_unit,remind_tick,"
- "alarm_type,alarm_utime,alarm_datetime "
- "FROM %s WHERE remind_tick_unit=%d AND alarm_type=%d AND alarm_datetime %s '%s' %s",
- CAL_TABLE_ALARM, CALENDAR_ALARM_TIME_UNIT_SPECIFIC, CALENDAR_TIME_LOCALTIME,
+ snprintf(query, sizeof(query), "SELECT A.event_id, A.remind_tick_unit, A.remind_tick,"
+ "A.alarm_type, A.alarm_utime, A.alarm_datetime "
+ "FROM "CAL_TABLE_ALARM" as A, "CAL_TABLE_SCHEDULE" as S ON A.event_id = S.id "
+ "WHERE S.link_base_id = 0 AND A.remind_tick_unit = %d AND A.alarm_type = %d "
+ "AND A.alarm_datetime %s '%s' %s",
+ CALENDAR_ALARM_TIME_UNIT_SPECIFIC, CALENDAR_TIME_LOCALTIME,
true == get_all ? "=" : ">", datetime,
true == get_all ? "" : "ORDER BY alarm_datetime ASC LIMIT 1");
st.tm_hour = h;
st.tm_min = n;
st.tm_sec = s;
- ad->alert_utime = (long long int)mktime(&st);
+ st.tm_isdst = cal_time_is_dst_savings();
+ ad->alert_utime = (long long int)_make_time(&st);
if (false == get_all) break;
}
sqlite3_finalize(stmt);
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_UTIME_INSTANCE, CALENDAR_ALARM_TIME_UNIT_SPECIFIC,
+ "FROM "CAL_TABLE_ALARM" as A, "CAL_TABLE_UTIME_INSTANCE" as B, "CAL_TABLE_SCHEDULE" as S "
+ "ON A.event_id = B.event_id AND B.event_id = S.id "
+ "WHERE S.link_base_id = 0 AND A.remind_tick_unit > %d "
+ "AND (B.dtstart_utime - (A.remind_tick_unit * A.remind_tick)) %s %ld %s",
+ 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");
* 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, "
- "A.alarm_type,A.alarm_utime,B.dtstart_datetime "
- "FROM %s as A, %s as B ON A.event_id = B.event_id "
- "WHERE A.remind_tick_unit >%d AND "
+ snprintf(query, sizeof(query), "SELECT A.event_id, A.remind_tick_unit, A.remind_tick, "
+ "A.alarm_type, A.alarm_utime, B.dtstart_datetime "
+ "FROM "CAL_TABLE_ALARM" as A, "CAL_TABLE_LOCALTIME_INSTANCE" as B, "CAL_TABLE_SCHEDULE" as S "
+ "ON A.event_id = B.event_id AND B.event_id = S.id "
+ "WHERE S.link_base_id = 0 AND 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_LOCALTIME_INSTANCE, CALENDAR_ALARM_TIME_UNIT_SPECIFIC,
+ 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;
st.tm_hour = h;
st.tm_min = n;
st.tm_sec = s;
- ad->alert_utime = (long long int)mktime(&st) - (ad->tick * ad->unit);
+ st.tm_isdst = cal_time_is_dst_savings();
+ ad->alert_utime = (long long int)_make_time(&st) - (ad->tick * ad->unit);
if (false == get_all) break;
}
sqlite3_finalize(stmt);
int ret = 0;
/*
* A:alarm
- * B:todo(utime)
+ * S: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,"
- "A.alarm_type,B.dtend_utime,A.alarm_datetime "
- "FROM %s as A, %s as B ON A.event_id = B.id "
- "WHERE A.remind_tick_unit >%d AND B.type =%d "
- "AND (B.dtend_utime - (A.remind_tick_unit * A.remind_tick)) %s %ld %s",
- CAL_TABLE_ALARM, CAL_TABLE_SCHEDULE,
+ snprintf(query, sizeof(query), "SELECT A.event_id, A.remind_tick_unit, A.remind_tick,"
+ "A.alarm_type, S.dtend_utime, A.alarm_datetime "
+ "FROM "CAL_TABLE_ALARM" as A, "CAL_TABLE_SCHEDULE" as S ON A.event_id = S.id "
+ "WHERE A.remind_tick_unit > %d AND S.type = %d "
+ "AND (S.dtend_utime - (A.remind_tick_unit * A.remind_tick)) %s %ld %s",
CALENDAR_ALARM_TIME_UNIT_SPECIFIC, CALENDAR_BOOK_TYPE_TODO,
true == get_all ? "=" : ">", utime,
- true == get_all ? "" : "ORDER BY (B.dtend_utime - (A.remind_tick_unit * A.remind_tick)) LIMIT 1 ");
+ true == get_all ? "" : "ORDER BY (S.dtend_utime - (A.remind_tick_unit * A.remind_tick)) LIMIT 1 ");
sqlite3_stmt *stmt = NULL;
ret = cal_db_util_query_prepare(query, &stmt);
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,B.dtend_datetime "
- "FROM %s as A, %s as B ON A.event_id = B.id "
+ "FROM "CAL_TABLE_ALARM" as A, "CAL_TABLE_SCHEDULE" as B ON A.event_id = B.id "
"WHERE A.remind_tick_unit >%d AND B.type =%d "
"AND (strftime('%%s', B.dtend_datetime) - (A.remind_tick_unit * A.remind_tick) - strftime('%%s', '%s') %s 0) %s",
- CAL_TABLE_ALARM, CAL_TABLE_SCHEDULE,
CALENDAR_ALARM_TIME_UNIT_SPECIFIC, CALENDAR_BOOK_TYPE_TODO,
datetime, true == get_all ? "=" : ">",
true == get_all ? "" : "ORDER BY (strftime('%s', B.dtend_datetime) - (A.remind_tick_unit * A.remind_tick)) LIMIT 1 ");
st.tm_hour = h;
st.tm_min = n;
st.tm_sec = s;
- ad->alert_utime = (long long int)mktime(&st) - (ad->tick * ad->unit);
+ st.tm_isdst = cal_time_is_dst_savings();
+ ad->alert_utime = (long long int)_make_time(&st) - (ad->tick * ad->unit);
if (false == get_all) break;
}
sqlite3_finalize(stmt);
static void _cal_server_alarm_get_latest(time_t utime, bool get_all, GList **out_l)
{
+ int ret = 0;
CAL_FN_CALL();
RET_IF(NULL == out_l);
localtime_r(&utime, &st_local);
char datetime[CAL_STR_SHORT_LEN32] = {0};
- snprintf(datetime, sizeof(datetime), CAL_FORMAT_LOCAL_DATETIME,
+ ret = snprintf(datetime, sizeof(datetime), CAL_FORMAT_LOCAL_DATETIME,
st_local.tm_year +1900, st_local.tm_mon + 1, st_local.tm_mday,
st_local.tm_hour, st_local.tm_min, st_local.tm_sec);
+
+ if(ret < 0){
+ WARN("datetime is truncated (%s)",datetime);
+ }
+
DBG("get alert to register with given time (%ld) datetime[%s]", utime, datetime);
GList *l = NULL;
static GFunc _cal_server_alarm_print_cb(gpointer data, gpointer user_data)
{
struct _alarm_data_s *ad = (struct _alarm_data_s *)data;
- DBG("id(%d) unit(%d) tick(%d) type(%d) time(%lld) datetime[%s]",
- ad->event_id, ad->unit, ad->tick, ad->type, ad->time, ad->datetime);
+ DBG("id(%d) unit(%d) tick(%d) type(%d) time(%lld) datetime[%s] alert_utime[%lld]",
+ ad->event_id, ad->unit, ad->tick, ad->type, ad->time, ad->datetime, ad->alert_utime);
return 0;
}
int ret = CALENDAR_ERROR_NONE;
GList *l = g_list_first(alarm_list);
+ RETV_IF(NULL == l, CALENDAR_ERROR_INVALID_PARAMETER);
+
struct _alarm_data_s *ad = (struct _alarm_data_s *)l->data;
RETVM_IF(NULL == ad, CALENDAR_ERROR_DB_FAILED, "No data");
}
GList *cursor = g_list_first(alarm_list);
for (i = 0; i < len; i++) {
+ if (NULL == cursor) {
+ ERR("cursor is NULL");
+ break;
+ }
struct _alarm_data_s *ad = (struct _alarm_data_s *)cursor->data;
if (NULL == ad) {
WARN("No data");
app_control_send_launch_request(ac, NULL, NULL);
app_control_destroy(ac);
- g_list_free_full(alarm_list, free);
for (i = 0; i < len; i++) {
free(ids[i]);
ids[i] = NULL;
_cal_server_alarm_noti_with_callback(l);
_cal_server_alarm_noti_with_control(l);
- /* DO NOT FREE LIST, list is freed in callback */
+ g_list_free_full(l, free);
}
static int _alert_cb(alarm_id_t alarm_id, void *data)
{
CAL_FN_CALL();
- DBG("alarm_id (%ld)", alarm_id);
+ DBG("alarm_id (%d)", (int)alarm_id);
time_t tt_alert = 0;
cal_server_alarm_get_alert_time(alarm_id, &tt_alert);
_cal_server_alarm_set_timechange();
_cal_server_alarm_set_inotify(_changed_cb);
- ret = alarmmgr_init("calendar-service");
+ ret = alarmmgr_set_cb(_alert_cb, NULL);
if (ret < 0) {
/* LCOV_EXCL_START */
- ERR("alarmmgr_init() Fail(%d)", ret);
+ ERR("alarmmgr_set_cb() Fail(%d)", ret);
return CALENDAR_ERROR_SYSTEM;
/* LCOV_EXCL_STOP */
}
- ret = alarmmgr_set_cb(_alert_cb, NULL);
+ ret = alarmmgr_init("calendar-service");
if (ret < 0) {
/* LCOV_EXCL_START */
- ERR("alarmmgr_set_cb() Fail(%d)", ret);
+ ERR("alarmmgr_init() Fail(%d)", ret);
return CALENDAR_ERROR_SYSTEM;
/* LCOV_EXCL_STOP */
}
projects / platform / core / pim / calendar-service.git / blobdiff