tizen_2.0_build

diff --git a/src/cals-event.c b/src/cals-event.c
index 52e4ba9..f7ace32 100755 (executable)
--- a/src/cals-event.c
+++ b/src/cals-event.c
@@ -234,11 +234,13 @@ API int calendar_svc_event_get_normal_list_by_period(int calendar_id, int op_cod
                                "B.dtend_type, A.dtend_utime "
                                "FROM %s as A, %s as B, %s as C "
                                "ON A.event_id = B.id AND B.calendar_id = C.rowid "
-                               "WHERE A.dtstart_utime <= %lld AND A.dtend_utime > %lld "
+                               "WHERE ((A.dtstart_utime < %lld AND A.dtend_utime > %lld) "
+                               "OR A.dtstart_utime = %lld) "
                                "AND B.type = %d AND B.is_deleted = 0 AND C.visibility = 1 %s "
                                "ORDER BY A.dtstart_utime ",
                                CALS_TABLE_NORMAL_INSTANCE, CALS_TABLE_SCHEDULE, CALS_TABLE_CALENDAR,
                                etime, stime,
+                               stime,
                                CALS_SCH_TYPE_EVENT, buf);
                break;
 
@@ -251,11 +253,13 @@ API int calendar_svc_event_get_normal_list_by_period(int calendar_id, int op_cod
                                "B.summary, B.location "
                                "FROM %s as A, %s as B, %s as C "
                                "ON A.event_id = B.id AND B.calendar_id = C.rowid "
-                               "WHERE A.dtstart_utime <= %lld AND A.dtend_utime > %lld "
+                               "WHERE ((A.dtstart_utime < %lld AND A.dtend_utime > %lld) "
+                               "OR A.dtstart_utime = %lld) "
                                "AND B.type = %d AND B.is_deleted = 0 AND C.visibility = 1 %s "
                                "ORDER BY A.dtstart_utime ",
                                CALS_TABLE_NORMAL_INSTANCE, CALS_TABLE_SCHEDULE, CALS_TABLE_CALENDAR,
                                etime, stime,
+                               stime,
                                CALS_SCH_TYPE_EVENT, buf);
                break;
 
@@ -269,11 +273,13 @@ API int calendar_svc_event_get_normal_list_by_period(int calendar_id, int op_cod
                                "B.meeting_status, B.priority, B.sensitivity, B.rrule_id "
                                "FROM %s as A, %s as B, %s as C "
                                "ON A.event_id = B.id AND B.calendar_id = C.rowid "
-                               "WHERE A.dtstart_utime <= %lld AND A.dtend_utime > %lld "
+                               "WHERE ((A.dtstart_utime < %lld AND A.dtend_utime > %lld) "
+                               "OR A.dtstart_utime = %lld) "
                                "AND B.type = %d AND B.is_deleted = 0 AND C.visibility = 1 %s "
                                "ORDER BY A.dtstart_utime ",
                                CALS_TABLE_NORMAL_INSTANCE, CALS_TABLE_SCHEDULE, CALS_TABLE_CALENDAR,
                                etime, stime,
+                               stime,
                                CALS_SCH_TYPE_EVENT, buf);
                break;
 
@@ -288,11 +294,13 @@ API int calendar_svc_event_get_normal_list_by_period(int calendar_id, int op_cod
                                "B.latitude, B.longitude "
                                "FROM %s as A, %s as B, %s as C "
                                "ON A.event_id = B.id AND B.calendar_id = C.rowid "
-                               "WHERE A.dtstart_utime <= %lld AND A.dtend_utime > %lld "
+                               "WHERE ((A.dtstart_utime < %lld AND A.dtend_utime > %lld) "
+                               "OR A.dtstart_utime = %lld) "
                                "AND B.type = %d AND B.is_deleted = 0 AND C.visibility = 1 %s "
                                "ORDER BY A.dtstart_utime ",
                                CALS_TABLE_NORMAL_INSTANCE, CALS_TABLE_SCHEDULE, CALS_TABLE_CALENDAR,
                                etime, stime,
+                               stime,
                                CALS_SCH_TYPE_EVENT, buf);
                break;
 
@@ -467,6 +475,13 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
        char query[CALS_SQL_MIN_LEN] = {0};
        sqlite3_stmt *stmt;
 
+       ret = cals_begin_trans();
+       if (ret != CAL_SUCCESS) {
+               ERR("cals_begin_trans() Failed(%d)", ret);
+               cals_end_trans(false);
+               return ret;
+       }
+
        len_datetime = strlen("YYYYMMDDTHHMMSSZ");
 
        /* delete instance from normal_instance_table */
@@ -476,8 +491,12 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
                        event_id, dtstart_utime);
 
        ret = cals_query_exec(query);
-       retvm_if(ret != CAL_SUCCESS, ret, "Failed to delete instance(errno:%d)"
-                       "[id:%d utime:%lld]", ret, event_id, dtstart_utime);
+       if (ret != CAL_SUCCESS) {
+               ERR("Failed to delete instance(errno:%d) [id:%d utime:%lld]",
+                               ret, event_id, dtstart_utime);
+               cals_end_trans(false);
+               return ret;
+       }
 
        /* get exdate to append */
        snprintf(query, sizeof(query), "SELECT %s FROM %s "
@@ -486,7 +505,11 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
                        event_id);
 
        stmt = cals_query_prepare(query);
-       retvm_if (NULL == stmt, CAL_ERR_DB_FAILED, "cals_query_prepare() failed.");
+       if (stmt == NULL) {
+               ERR("cals_query_prepare() failed.");
+               cals_end_trans(false);
+               return CAL_ERR_DB_FAILED;
+       }
 
        ret = cals_stmt_step(stmt);
        if (ret == CAL_TRUE) {
@@ -496,6 +519,7 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
        } else if (ret != CAL_SUCCESS) {
                ERR("Failed to step(errno:%d)", ret);
                sqlite3_finalize(stmt);
+               cals_end_trans(false);
                return ret;
        }
 
@@ -505,6 +529,7 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
                if (p == NULL) {
                        ERR("Failed to calloc");
                        sqlite3_finalize(stmt);
+                       cals_end_trans(false);
                        return CAL_ERR_OUT_OF_MEMORY;
                }
                str_datetime =  cals_time_get_str_datetime(NULL, dtstart_utime);
@@ -518,6 +543,7 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
                if (p == NULL) {
                        ERR("Failed to calloc");
                        sqlite3_finalize(stmt);
+                       cals_end_trans(false);
                        return CAL_ERR_OUT_OF_MEMORY;
                }
                str_datetime =  cals_time_get_str_datetime(NULL, dtstart_utime);
@@ -527,15 +553,22 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
        if (str_datetime) free(str_datetime);
        sqlite3_finalize(stmt);
 
-       /* updaet exdate from schedule table */
+       /* updaet exdate, version, last_mod from schedule table */
        snprintf(query, sizeof(query), "UPDATE %s SET "
-                       "exdate = ? "
+                       "exdate = ?, "
+                       "changed_ver = %d, "
+                       "last_mod = strftime('%%s','now') "
                        "WHERE id = %d ",
                        CALS_TABLE_SCHEDULE,
+                       cals_get_next_ver(),
                        event_id);
 
        stmt = cals_query_prepare(query);
-       retvm_if (NULL == stmt, CAL_ERR_DB_FAILED, "Failed to prepare(errno:%d)", ret);
+       if (stmt == NULL) {
+               ERR("cals_query_prepare() failed.");
+               cals_end_trans(false);
+               return CAL_ERR_DB_FAILED;
+       }
 
        cals_stmt_bind_text(stmt, 1, p);
 
@@ -543,6 +576,7 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
        if (CAL_SUCCESS != ret) {
                sqlite3_finalize(stmt);
                ERR("sqlite3_step() Failed(%d)", ret);
+               cals_end_trans(false);
                return ret;
        }
        sqlite3_finalize(stmt);
@@ -553,6 +587,8 @@ API int calendar_svc_event_delete_normal_instance(int event_id, long long int dt
                WARN("cals_notify failed (%d)", ret);
        }
 
+       cals_end_trans(true);
+
        return CAL_SUCCESS;
 }
 
@@ -565,6 +601,13 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
        char buf[32] = {0};
        sqlite3_stmt *stmt;
 
+       ret = cals_begin_trans();
+       if (ret != CAL_SUCCESS) {
+               ERR("cals_begin_trans() Failed(%d)", ret);
+               cals_end_trans(false);
+               return ret;
+       }
+
        len_datetime = strlen("YYYYMMDDTHHMMSSZ");
 
        /* delete instance from normal_instance_table */
@@ -576,8 +619,12 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
                        event_id, buf);
 
        ret = cals_query_exec(query);
-       retvm_if(ret != CAL_SUCCESS, ret, "Failed to delete instance(errno:%d)"
-                       "[id:%d datetime:%s]", ret, event_id, buf);
+       if (ret != CAL_SUCCESS) {
+               ERR("Failed to delete instance(errno:%d) [id:%d datetime:%s]",
+                               ret, event_id, buf);
+               cals_end_trans(false);
+               return ret;
+       }
 
        /* get exdate to append */
        snprintf(query, sizeof(query), "SELECT %s FROM %s "
@@ -586,7 +633,11 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
                        event_id);
 
        stmt = cals_query_prepare(query);
-       retvm_if (NULL == stmt, CAL_ERR_DB_FAILED, "cals_query_prepare() failed.");
+       if (stmt == NULL) {
+               ERR("cals_query_prepare() failed.");
+               cals_end_trans(false);
+               return CAL_ERR_DB_FAILED;
+       }
 
        ret = cals_stmt_step(stmt);
        if (ret == CAL_TRUE) {
@@ -596,6 +647,7 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
        } else if (ret != CAL_SUCCESS) {
                ERR("Failed to step(errno:%d)", ret);
                sqlite3_finalize(stmt);
+               cals_end_trans(false);
                return ret;
        }
 
@@ -617,6 +669,7 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
                if (p == NULL) {
                        ERR("Failed to calloc");
                        sqlite3_finalize(stmt);
+                       cals_end_trans(false);
                        return CAL_ERR_OUT_OF_MEMORY;
                }
                snprintf(p, len + strlen(",") + len_datetime + 1, "%s,%s",
@@ -632,7 +685,11 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
                        event_id);
 
        stmt = cals_query_prepare(query);
-       retvm_if (NULL == stmt, CAL_ERR_DB_FAILED, "Failed to prepare(errno:%d)", ret);
+       if (stmt == NULL) {
+               ERR("cals_query_prepare() failed.");
+               cals_end_trans(false);
+               return CAL_ERR_DB_FAILED;
+       }
 
        cals_stmt_bind_text(stmt, 1, p);
 
@@ -640,6 +697,7 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
        if (CAL_SUCCESS != ret) {
                sqlite3_finalize(stmt);
                ERR("sqlite3_step() Failed(%d)", ret);
+               cals_end_trans(false);
                return ret;
        }
        sqlite3_finalize(stmt);
@@ -650,6 +708,8 @@ API int calendar_svc_event_delete_allday_instance(int event_id, int dtstart_year
                WARN("cals_notify failed (%d)", ret);
        }
 
+       cals_end_trans(true);
+
        return CAL_SUCCESS;
 }
 

diff --git a/src/cals-instance.c b/src/cals-instance.c
index 9537412..300de70 100644 (file)
--- a/src/cals-instance.c
+++ b/src/cals-instance.c
@@ -178,7 +178,7 @@ static inline void _ucal_set_month(UCalendar *cal, int month)
 static inline void _ucal_set_wday(UCalendar *cal, int wday)
 {
        if (wday == CALS_NODAY) {
-               DBG("this is wday repeat, so pass this shift");
+               DBG("this is mday repeat, so pass this shift");
                return;
        }
        ucal_set(cal, UCAL_DAY_OF_WEEK, wdays[wday].uday);
@@ -544,10 +544,12 @@ static inline int _get_month(const char *str)
 {
        int month;
 
+       DBG("[%s]", str);
        if (!str || !*str)
                return -1;
 
        month = atoi(str);
+       DBG("(%d)", month);
        if (month < CALS_JANUARY || month > CALS_DECEMBER)
                return -1;
 

diff --git a/src/cals-provider.c b/src/cals-provider.c
index 985752f..f5aac9d 100755 (executable)
--- a/src/cals-provider.c
+++ b/src/cals-provider.c
@@ -941,7 +941,7 @@ API int calendar_svc_clean_after_sync(int calendar_id)
        /* delete recur table */
        /* get event id which id_delete = 1 */
        snprintf(query, sizeof(query), "SELECT id FROM %s "
-                       "WHERE is_delete = 1 AND calendar_id = %d",
+                       "WHERE is_deleted = 1 AND calendar_id = %d",
                        CALS_TABLE_SCHEDULE,
                        calendar_id);
        stmt = cals_query_prepare(query);

diff --git a/src/cals-time.c b/src/cals-time.c
index e7ca934..b2d8602 100644 (file)
--- a/src/cals-time.c
+++ b/src/cals-time.c
@@ -122,7 +122,7 @@ char *cals_time_get_str_datetime(char *tzid, long long int t)
        y = ucal_get(cal, UCAL_YEAR, &status);
        mon = ucal_get(cal, UCAL_MONTH, &status) + 1;
        d = ucal_get(cal, UCAL_DATE, &status);
-       h = ucal_get(cal, UCAL_HOUR, &status);
+       h = ucal_get(cal, UCAL_HOUR_OF_DAY, &status);
        m = ucal_get(cal, UCAL_MINUTE, &status);
        s = ucal_get(cal, UCAL_SECOND, &status);