modify terminology:calendar->book,allday->localtime,normal->utime,svc->service 41/83441/5
authorJeesun Kim <iamjs.kim@samsung.com>
Thu, 11 Aug 2016 01:36:50 +0000 (10:36 +0900)
committerJeesun Kim <iamjs.kim@samsung.com>
Thu, 11 Aug 2016 06:47:14 +0000 (15:47 +0900)
Change-Id: I2822d1d1c1f02857b6422fd157ae50d4f7bdb74d

55 files changed:
client/cal_client_db_helper.c
common/cal_filter.h
common/cal_inotify.c
common/cal_inotify.h
common/cal_internal.h
common/cal_list.h
common/cal_mutex.h
common/cal_query.h
common/cal_record.c
common/cal_record.h
common/cal_record_book.c [moved from common/cal_record_calendar.c with 67% similarity]
common/cal_record_event.c
common/cal_record_instance_allday.c [deleted file]
common/cal_record_instance_allday_extended.c [deleted file]
common/cal_record_instance_localtime.c [new file with mode: 0644]
common/cal_record_instance_localtime_extended.c [new file with mode: 0644]
common/cal_record_instance_normal.c [deleted file]
common/cal_record_instance_normal_extended.c [deleted file]
common/cal_record_instance_utime.c [new file with mode: 0644]
common/cal_record_instance_utime_extended.c [new file with mode: 0644]
common/cal_record_todo.c
common/cal_time.h
common/cal_typedef.h
common/cal_vcalendar.h
common/cal_vcalendar_make.h
common/cal_vcalendar_parse.h
common/cal_view.c
common/cal_view.h
common/dbus/cal_dbus_helper.c
common/dbus/cal_dbus_helper.h
packaging/calendar-service.spec
server/cal_access_control.h
server/cal_server.c
server/cal_server_account.c
server/cal_server_account.h
server/cal_server_alarm.c
server/cal_server_ondemand.h
server/cal_server_service.h
server/db/cal_db.c
server/db/cal_db.h
server/db/cal_db_instance.c
server/db/cal_db_instance_helper.c
server/db/cal_db_plugin_book.c [moved from server/db/cal_db_plugin_calendar.c with 84% similarity]
server/db/cal_db_plugin_book_helper.c [moved from server/db/cal_db_plugin_calendar_helper.c with 98% similarity]
server/db/cal_db_plugin_book_helper.h [moved from server/db/cal_db_plugin_calendar_helper.h with 100% similarity]
server/db/cal_db_plugin_event.c
server/db/cal_db_plugin_event_helper.c
server/db/cal_db_plugin_instance_localtime.c [moved from server/db/cal_db_plugin_instance_allday.c with 80% similarity]
server/db/cal_db_plugin_instance_localtime_extended.c [moved from server/db/cal_db_plugin_instance_allday_extended.c with 78% similarity]
server/db/cal_db_plugin_instance_utime.c [moved from server/db/cal_db_plugin_instance_normal.c with 79% similarity]
server/db/cal_db_plugin_instance_utime_extended.c [moved from server/db/cal_db_plugin_instance_normal_extended.c with 78% similarity]
server/db/cal_db_plugin_search.c
server/db/cal_db_plugin_todo.c
server/db/cal_db_query.c
server/db/cal_db_util.c

index 7a0cb18..b611233 100644 (file)
@@ -40,16 +40,16 @@ int cal_client_db_add_changed_cb(calendar_h handle, const char* view_uri, void *
 
        type = cal_view_get_type(view_uri);
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
-               ret = cal_inotify_subscribe(CAL_NOTI_TYPE_CALENDAR, CAL_NOTI_CALENDAR_CHANGED,
+       case CAL_RECORD_TYPE_BOOK:
+               ret = cal_inotify_subscribe(CAL_NOTI_TYPE_BOOK, CAL_NOTI_FILE_BOOK,
                                callback, user_data);
                break;
        case CAL_RECORD_TYPE_EVENT:
-               ret = cal_inotify_subscribe(CAL_NOTI_TYPE_EVENT, CAL_NOTI_EVENT_CHANGED,
+               ret = cal_inotify_subscribe(CAL_NOTI_TYPE_EVENT, CAL_NOTI_FILE_EVENT,
                                callback, user_data);
                break;
        case CAL_RECORD_TYPE_TODO:
-               ret = cal_inotify_subscribe(CAL_NOTI_TYPE_TODO, CAL_NOTI_TODO_CHANGED,
+               ret = cal_inotify_subscribe(CAL_NOTI_TYPE_TODO, CAL_NOTI_FILE_TODO,
                                callback, user_data);
                break;
        default:
@@ -79,14 +79,14 @@ int cal_client_db_remove_changed_cb(calendar_h handle, const char* view_uri, cal
 
        type = cal_view_get_type(view_uri);
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
-               ret = cal_inotify_unsubscribe(CAL_NOTI_CALENDAR_CHANGED, callback, user_data);
+       case CAL_RECORD_TYPE_BOOK:
+               ret = cal_inotify_unsubscribe(CAL_NOTI_FILE_BOOK, callback, user_data);
                break;
        case CAL_RECORD_TYPE_EVENT:
-               ret = cal_inotify_unsubscribe(CAL_NOTI_EVENT_CHANGED, callback, user_data);
+               ret = cal_inotify_unsubscribe(CAL_NOTI_FILE_EVENT, callback, user_data);
                break;
        case CAL_RECORD_TYPE_TODO:
-               ret = cal_inotify_unsubscribe(CAL_NOTI_TODO_CHANGED, callback, user_data);
+               ret = cal_inotify_unsubscribe(CAL_NOTI_FILE_TODO, callback, user_data);
                break;
        default:
                /* LCOV_EXCL_START */
index c4a0ec8..558708c 100644 (file)
  *
  */
 
-#ifndef __CALENDAR_SVC_FILTER_H__
-#define __CALENDAR_SVC_FILTER_H__
+#ifndef __CALENDAR_SERVICE_FILTER_H__
+#define __CALENDAR_SERVICE_FILTER_H__
 
 #include "calendar_filter.h"
 
 int cal_filter_clone(calendar_filter_h filter, calendar_filter_h* out_filter);
 
-#endif /*__CALENDAR_SVC_FILTER_H__ */
+#endif /*__CALENDAR_SERVICE_FILTER_H__ */
index bb2fccc..28f9d1f 100644 (file)
@@ -61,8 +61,8 @@ static inline void _handle_callback(GSList *_noti_list, int wd, uint32_t mask)
                if (noti->wd == wd) {
                        if ((mask & IN_CLOSE_WRITE) && noti->cb) {
                                switch (noti->noti_type) {
-                               case CAL_NOTI_TYPE_CALENDAR:
-                                       noti->cb(CALENDAR_VIEW_CALENDAR, noti->cb_data);
+                               case CAL_NOTI_TYPE_BOOK:
+                                       noti->cb(CALENDAR_VIEW_BOOK, noti->cb_data);
                                        break;
                                case CAL_NOTI_TYPE_EVENT:
                                        noti->cb(CALENDAR_VIEW_EVENT, noti->cb_data);
index 340cb4b..a7a9621 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_INOTIFY_H__
-#define __CALENDAR_SVC_INOTIFY_H__
+#ifndef __CALENDAR_SERVICE_INOTIFY_H__
+#define __CALENDAR_SERVICE_INOTIFY_H__
 
 #include "calendar_db.h"
 #include "cal_typedef.h"
@@ -28,4 +28,4 @@ int cal_inotify_subscribe(cal_noti_type_e type, const char *path, void *cb, void
 int cal_inotify_unsubscribe(const char *path, void *cb, void *user_data);
 void cal_inotify_deinit(void);
 
-#endif /* __CALENDAR_SVC_INOTIFY_H__ */
+#endif /* __CALENDAR_SERVICE_INOTIFY_H__ */
index d242d0c..3cf3bdb 100644 (file)
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SVC_INTERNAL_H__
-#define __CALENDAR_SVC_INTERNAL_H__
+#ifndef __CALENDAR_SERVICE_INTERNAL_H__
+#define __CALENDAR_SERVICE_INTERNAL_H__
 
 #include <stdio.h>
 #include <string.h>
 #define TLS
 #endif
 
-#endif /* __CALENDAR_SVC_INTERNAL_H__ */
+#endif /* __CALENDAR_SERVICE_INTERNAL_H__ */
 
index b81ab1c..95f2c3b 100644 (file)
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SVC_LIST_H__
-#define __CALENDAR_SVC_LIST_H__
+#ifndef __CALENDAR_SERVICE_LIST_H__
+#define __CALENDAR_SERVICE_LIST_H__
 
 #include "calendar_list.h"
 
@@ -25,4 +25,4 @@ int cal_list_clone(calendar_list_h list, calendar_list_h *out_list);
 int cal_list_get_nth_record_p(cal_list_s *list_s, int index, calendar_record_h *record);
 int cal_list_clear(cal_list_s *list_s);
 
-#endif /* __CALENDAR_SVC_LIST_H__ */
+#endif /* __CALENDAR_SERVICE_LIST_H__ */
index c407f20..ee8fb6a 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_MUTEX_H__
-#define __CALENDAR_SVC_MUTEX_H__
+#ifndef __CALENDAR_SERVICE_MUTEX_H__
+#define __CALENDAR_SERVICE_MUTEX_H__
 
 enum {
        CAL_MUTEX_CONNECTION,
@@ -34,4 +34,4 @@ enum {
 void cal_mutex_lock(int type);
 void cal_mutex_unlock(int type);
 
-#endif  /*__CALENDAR_SVC_MUTEX_H__ */
+#endif  /*__CALENDAR_SERVICE_MUTEX_H__ */
index 54ad1ce..e2615d8 100644 (file)
@@ -17,7 +17,7 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_QUERY_H__
-#define __CALENDAR_SVC_QUERY_H__
+#ifndef __CALENDAR_SERVICE_QUERY_H__
+#define __CALENDAR_SERVICE_QUERY_H__
 
-#endif  /* __CALENDAR_SVC_QUERY_H__ */
+#endif  /* __CALENDAR_SERVICE_QUERY_H__ */
index 43db95d..49cee0e 100644 (file)
                return CALENDAR_ERROR_NOT_PERMITTED; \
        }
 
-extern cal_record_plugin_cb_s cal_record_calendar_plugin_cb;
+extern cal_record_plugin_cb_s cal_record_book_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_event_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_todo_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_alarm_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_attendee_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_timezone_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_updated_info_plugin_cb;
-extern cal_record_plugin_cb_s cal_record_instance_normal_plugin_cb;
-extern cal_record_plugin_cb_s cal_record_instance_allday_plugin_cb;
-extern cal_record_plugin_cb_s cal_record_instance_normal_extended_plugin_cb;
-extern cal_record_plugin_cb_s cal_record_instance_allday_extended_plugin_cb;
+extern cal_record_plugin_cb_s cal_record_instance_utime_plugin_cb;
+extern cal_record_plugin_cb_s cal_record_instance_localtime_plugin_cb;
+extern cal_record_plugin_cb_s cal_record_instance_utime_extended_plugin_cb;
+extern cal_record_plugin_cb_s cal_record_instance_localtime_extended_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_search_plugin_cb;
 extern cal_record_plugin_cb_s cal_record_extended_plugin_cb;
 
 cal_record_plugin_cb_s* cal_record_get_plugin_cb(cal_record_type_e type)
 {
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
-               return (&cal_record_calendar_plugin_cb);
+       case CAL_RECORD_TYPE_BOOK:
+               return (&cal_record_book_plugin_cb);
        case CAL_RECORD_TYPE_EVENT:
                return (&cal_record_event_plugin_cb);
        case CAL_RECORD_TYPE_TODO:
@@ -62,14 +62,14 @@ cal_record_plugin_cb_s* cal_record_get_plugin_cb(cal_record_type_e type)
                return (&cal_record_attendee_plugin_cb);
        case CAL_RECORD_TYPE_TIMEZONE:
                return (&cal_record_timezone_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
-               return (&cal_record_instance_normal_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
-               return (&cal_record_instance_allday_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-               return (&cal_record_instance_normal_extended_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-               return (&cal_record_instance_allday_extended_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME:
+               return (&cal_record_instance_utime_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
+               return (&cal_record_instance_localtime_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+               return (&cal_record_instance_utime_extended_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+               return (&cal_record_instance_localtime_extended_plugin_cb);
        case CAL_RECORD_TYPE_UPDATED_INFO:
                return (&cal_record_updated_info_plugin_cb);
        case CAL_RECORD_TYPE_SEARCH:
index d8e1579..d74d5cd 100644 (file)
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SVC_RECORD_H__
-#define __CALENDAR_SVC_RECORD_H__
+#ifndef __CALENDAR_SERVICE_RECORD_H__
+#define __CALENDAR_SERVICE_RECORD_H__
 
 #include "calendar_record.h"
 
@@ -27,16 +27,16 @@ extern "C" {
 
 typedef enum {
        CAL_RECORD_TYPE_INVALID = 0,
-       CAL_RECORD_TYPE_CALENDAR,
+       CAL_RECORD_TYPE_BOOK,
        CAL_RECORD_TYPE_EVENT ,
        CAL_RECORD_TYPE_TODO,
        CAL_RECORD_TYPE_TIMEZONE,
        CAL_RECORD_TYPE_ATTENDEE,
        CAL_RECORD_TYPE_ALARM,
-       CAL_RECORD_TYPE_INSTANCE_NORMAL,
-       CAL_RECORD_TYPE_INSTANCE_ALLDAY,
-       CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED,
-       CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED,
+       CAL_RECORD_TYPE_INSTANCE_UTIME,
+       CAL_RECORD_TYPE_INSTANCE_LOCALTIME,
+       CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED,
+       CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED,
        CAL_RECORD_TYPE_UPDATED_INFO,
        CAL_RECORD_TYPE_SEARCH,
        CAL_RECORD_TYPE_EXTENDED,
@@ -144,5 +144,5 @@ int cal_record_set_caltime(calendar_record_h record, unsigned int property_id, c
 }
 #endif
 
-#endif /* __CALENDAR_SVC_RECORD_H__ */
+#endif /* __CALENDAR_SERVICE_RECORD_H__ */
 
similarity index 67%
rename from common/cal_record_calendar.c
rename to common/cal_record_book.c
index 267d6d4..82023f8 100644 (file)
 #include "cal_record.h"
 #include "cal_utils.h"
 
-static int _cal_record_calendar_create(calendar_record_h* out_record);
-static int _cal_record_calendar_destroy(calendar_record_h record, bool delete_child);
-static int _cal_record_calendar_clone(calendar_record_h record, calendar_record_h* out_record);
-static int _cal_record_calendar_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_calendar_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_calendar_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
-static int _cal_record_calendar_set_str(calendar_record_h record, unsigned int property_id, const char* value);
-static int _cal_record_calendar_set_int(calendar_record_h record, unsigned int property_id, int value);
-
-cal_record_plugin_cb_s cal_record_calendar_plugin_cb = {
-       .create = _cal_record_calendar_create,
-       .destroy = _cal_record_calendar_destroy,
-       .clone = _cal_record_calendar_clone,
-       .get_str = _cal_record_calendar_get_str,
-       .get_str_p = _cal_record_calendar_get_str_p,
-       .get_int = _cal_record_calendar_get_int,
+static int _cal_record_book_create(calendar_record_h* out_record);
+static int _cal_record_book_destroy(calendar_record_h record, bool delete_child);
+static int _cal_record_book_clone(calendar_record_h record, calendar_record_h* out_record);
+static int _cal_record_book_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_book_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_book_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
+static int _cal_record_book_set_str(calendar_record_h record, unsigned int property_id, const char* value);
+static int _cal_record_book_set_int(calendar_record_h record, unsigned int property_id, int value);
+
+cal_record_plugin_cb_s cal_record_book_plugin_cb = {
+       .create = _cal_record_book_create,
+       .destroy = _cal_record_book_destroy,
+       .clone = _cal_record_book_clone,
+       .get_str = _cal_record_book_get_str,
+       .get_str_p = _cal_record_book_get_str_p,
+       .get_int = _cal_record_book_get_int,
        .get_double = NULL,
        .get_lli = NULL,
        .get_caltime = NULL,
-       .set_str = _cal_record_calendar_set_str,
-       .set_int = _cal_record_calendar_set_int,
+       .set_str = _cal_record_book_set_str,
+       .set_int = _cal_record_book_set_int,
        .set_double = NULL,
        .set_lli = NULL,
        .set_caltime = NULL,
@@ -58,7 +58,7 @@ cal_record_plugin_cb_s cal_record_calendar_plugin_cb = {
        .clone_child_record_list = NULL
 };
 
-static void _cal_record_calendar_struct_init(cal_book_s *record)
+static void _cal_record_book_struct_init(cal_book_s *record)
 {
        memset(record, 0, sizeof(cal_book_s));
        record->index = -1;
@@ -67,7 +67,7 @@ static void _cal_record_calendar_struct_init(cal_book_s *record)
        record->sync_event = 1;
 }
 
-static int _cal_record_calendar_create(calendar_record_h* out_record)
+static int _cal_record_book_create(calendar_record_h* out_record)
 {
        cal_book_s *temp = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -75,14 +75,14 @@ static int _cal_record_calendar_create(calendar_record_h* out_record)
        temp = calloc(1, sizeof(cal_book_s));
        RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
 
-       _cal_record_calendar_struct_init(temp);
+       _cal_record_book_struct_init(temp);
 
        *out_record = (calendar_record_h)temp;
 
        return ret;
 }
 
-static void _cal_record_calendar_struct_free(cal_book_s *record)
+static void _cal_record_book_struct_free(cal_book_s *record)
 {
        CAL_FREE(record->uid);
        CAL_FREE(record->name);
@@ -96,18 +96,18 @@ static void _cal_record_calendar_struct_free(cal_book_s *record)
        CAL_FREE(record);
 }
 
-static int _cal_record_calendar_destroy(calendar_record_h record, bool delete_child)
+static int _cal_record_book_destroy(calendar_record_h record, bool delete_child)
 {
        int ret = CALENDAR_ERROR_NONE;
 
        cal_book_s *temp = (cal_book_s*)(record);
 
-       _cal_record_calendar_struct_free(temp);
+       _cal_record_book_struct_free(temp);
 
        return ret;
 }
 
-static int _cal_record_calendar_clone(calendar_record_h record, calendar_record_h* out_record)
+static int _cal_record_book_clone(calendar_record_h record, calendar_record_h* out_record)
 {
        cal_book_s *out_data = NULL;
        cal_book_s *src_data = NULL;
@@ -143,35 +143,35 @@ static int _cal_record_calendar_clone(calendar_record_h record, calendar_record_
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_record_calendar_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
+static int _cal_record_book_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
 {
        cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
-       case CAL_PROPERTY_CALENDAR_UID:
+       case CAL_PROPERTY_BOOK_UID:
                *out_str = cal_strdup(cal_rec->uid);
                break;
-       case CAL_PROPERTY_CALENDAR_NAME:
+       case CAL_PROPERTY_BOOK_NAME:
                *out_str = cal_strdup(cal_rec->name);
                break;
-       case CAL_PROPERTY_CALENDAR_DESCRIPTION:
+       case CAL_PROPERTY_BOOK_DESCRIPTION:
                *out_str = cal_strdup(cal_rec->description);
                break;
-       case CAL_PROPERTY_CALENDAR_COLOR:
+       case CAL_PROPERTY_BOOK_COLOR:
                *out_str = cal_strdup(cal_rec->color);
                break;
-       case CAL_PROPERTY_CALENDAR_LOCATION:
+       case CAL_PROPERTY_BOOK_LOCATION:
                *out_str = cal_strdup(cal_rec->location);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA1:
+       case CAL_PROPERTY_BOOK_SYNC_DATA1:
                *out_str = cal_strdup(cal_rec->sync_data1);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA2:
+       case CAL_PROPERTY_BOOK_SYNC_DATA2:
                *out_str = cal_strdup(cal_rec->sync_data2);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA3:
+       case CAL_PROPERTY_BOOK_SYNC_DATA3:
                *out_str = cal_strdup(cal_rec->sync_data3);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA4:
+       case CAL_PROPERTY_BOOK_SYNC_DATA4:
                *out_str = cal_strdup(cal_rec->sync_data4);
                break;
        default:
@@ -184,35 +184,35 @@ static int _cal_record_calendar_get_str(calendar_record_h record, unsigned int p
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_record_calendar_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
+static int _cal_record_book_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
 {
        cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
-       case CAL_PROPERTY_CALENDAR_UID:
+       case CAL_PROPERTY_BOOK_UID:
                *out_str = (cal_rec->uid);
                break;
-       case CAL_PROPERTY_CALENDAR_NAME:
+       case CAL_PROPERTY_BOOK_NAME:
                *out_str = (cal_rec->name);
                break;
-       case CAL_PROPERTY_CALENDAR_DESCRIPTION:
+       case CAL_PROPERTY_BOOK_DESCRIPTION:
                *out_str = (cal_rec->description);
                break;
-       case CAL_PROPERTY_CALENDAR_COLOR:
+       case CAL_PROPERTY_BOOK_COLOR:
                *out_str = (cal_rec->color);
                break;
-       case CAL_PROPERTY_CALENDAR_LOCATION:
+       case CAL_PROPERTY_BOOK_LOCATION:
                *out_str = (cal_rec->location);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA1:
+       case CAL_PROPERTY_BOOK_SYNC_DATA1:
                *out_str = (cal_rec->sync_data1);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA2:
+       case CAL_PROPERTY_BOOK_SYNC_DATA2:
                *out_str = (cal_rec->sync_data2);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA3:
+       case CAL_PROPERTY_BOOK_SYNC_DATA3:
                *out_str = (cal_rec->sync_data3);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA4:
+       case CAL_PROPERTY_BOOK_SYNC_DATA4:
                *out_str = (cal_rec->sync_data4);
                break;
        default:
@@ -225,26 +225,26 @@ static int _cal_record_calendar_get_str_p(calendar_record_h record, unsigned int
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_record_calendar_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
+static int _cal_record_book_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
 {
        cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
-       case CAL_PROPERTY_CALENDAR_ID:
+       case CAL_PROPERTY_BOOK_ID:
                *out_value = (cal_rec->index);
                break;
-       case CAL_PROPERTY_CALENDAR_VISIBILITY:
+       case CAL_PROPERTY_BOOK_VISIBILITY:
                *out_value = (cal_rec->visibility);
                break;
-       case CAL_PROPERTY_CALENDAR_ACCOUNT_ID:
+       case CAL_PROPERTY_BOOK_ACCOUNT_ID:
                *out_value = (cal_rec->account_id);
                break;
-       case CAL_PROPERTY_CALENDAR_STORE_TYPE:
+       case CAL_PROPERTY_BOOK_STORE_TYPE:
                *out_value = (cal_rec->store_type);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_EVENT:
+       case CAL_PROPERTY_BOOK_SYNC_EVENT:
                *out_value = (cal_rec->sync_event);
                break;
-       case CAL_PROPERTY_CALENDAR_MODE:
+       case CAL_PROPERTY_BOOK_MODE:
                *out_value = (cal_rec->mode);
                break;
        default:
@@ -257,43 +257,43 @@ static int _cal_record_calendar_get_int(calendar_record_h record, unsigned int p
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_record_calendar_set_str(calendar_record_h record, unsigned int property_id, const char* value)
+static int _cal_record_book_set_str(calendar_record_h record, unsigned int property_id, const char* value)
 {
        cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
-       case CAL_PROPERTY_CALENDAR_UID:
+       case CAL_PROPERTY_BOOK_UID:
                CAL_FREE(cal_rec->uid);
                cal_rec->uid = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_NAME:
+       case CAL_PROPERTY_BOOK_NAME:
                CAL_FREE(cal_rec->name);
                cal_rec->name = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_DESCRIPTION:
+       case CAL_PROPERTY_BOOK_DESCRIPTION:
                CAL_FREE(cal_rec->description);
                cal_rec->description = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_COLOR:
+       case CAL_PROPERTY_BOOK_COLOR:
                CAL_FREE(cal_rec->color);
                cal_rec->color = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_LOCATION:
+       case CAL_PROPERTY_BOOK_LOCATION:
                CAL_FREE(cal_rec->location);
                cal_rec->location = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA1:
+       case CAL_PROPERTY_BOOK_SYNC_DATA1:
                CAL_FREE(cal_rec->sync_data1);
                cal_rec->sync_data1 = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA2:
+       case CAL_PROPERTY_BOOK_SYNC_DATA2:
                CAL_FREE(cal_rec->sync_data2);
                cal_rec->sync_data2 = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA3:
+       case CAL_PROPERTY_BOOK_SYNC_DATA3:
                CAL_FREE(cal_rec->sync_data3);
                cal_rec->sync_data3 = cal_strdup(value);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA4:
+       case CAL_PROPERTY_BOOK_SYNC_DATA4:
                CAL_FREE(cal_rec->sync_data4);
                cal_rec->sync_data4 = cal_strdup(value);
                break;
@@ -307,21 +307,21 @@ static int _cal_record_calendar_set_str(calendar_record_h record, unsigned int p
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_record_calendar_set_int(calendar_record_h record, unsigned int property_id, int value)
+static int _cal_record_book_set_int(calendar_record_h record, unsigned int property_id, int value)
 {
        cal_book_s *cal_rec = (cal_book_s*)(record);
        switch (property_id) {
-       case CAL_PROPERTY_CALENDAR_ID:
+       case CAL_PROPERTY_BOOK_ID:
                (cal_rec->index) = value;
                break;
-       case CAL_PROPERTY_CALENDAR_VISIBILITY:
+       case CAL_PROPERTY_BOOK_VISIBILITY:
                (cal_rec->visibility) = value;
                break;
-       case CAL_PROPERTY_CALENDAR_ACCOUNT_ID:
+       case CAL_PROPERTY_BOOK_ACCOUNT_ID:
                RETVM_IF(0 < cal_rec->index, CALENDAR_ERROR_INVALID_PARAMETER, "property_id(%d) is a write-once value (calendar)", property_id);
                (cal_rec->account_id) = value;
                break;
-       case CAL_PROPERTY_CALENDAR_STORE_TYPE:
+       case CAL_PROPERTY_BOOK_STORE_TYPE:
                switch (value) {
                case CALENDAR_BOOK_TYPE_NONE:
                case CALENDAR_BOOK_TYPE_EVENT:
@@ -335,7 +335,7 @@ static int _cal_record_calendar_set_int(calendar_record_h record, unsigned int p
                        /* LCOV_EXCL_STOP */
                }
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_EVENT:
+       case CAL_PROPERTY_BOOK_SYNC_EVENT:
                switch (value) {
                case CALENDAR_BOOK_SYNC_EVENT_FOR_ME:
                case CALENDAR_BOOK_SYNC_EVENT_FOR_EVERY_AND_REMAIN:
@@ -349,7 +349,7 @@ static int _cal_record_calendar_set_int(calendar_record_h record, unsigned int p
                        /* LCOV_EXCL_STOP */
                }
                break;
-       case CAL_PROPERTY_CALENDAR_MODE:
+       case CAL_PROPERTY_BOOK_MODE:
                RETVM_IF(value != CALENDAR_BOOK_MODE_NONE && value != CALENDAR_BOOK_MODE_RECORD_READONLY,
                                CALENDAR_ERROR_INVALID_PARAMETER, "Invalid parameter : mode type is invalid value (%d)", value);
                (cal_rec->mode) = value;
index c8e26b7..e1f3a22 100644 (file)
@@ -441,7 +441,7 @@ static int _cal_record_event_get_int(calendar_record_h record, unsigned int prop
        case CAL_PROPERTY_EVENT_ID:
                *out_value = (rec->index);
                break;
-       case CAL_PROPERTY_EVENT_CALENDAR_ID:
+       case CAL_PROPERTY_EVENT_BOOK_ID:
                *out_value = (rec->calendar_id);
                break;
        case CAL_PROPERTY_EVENT_EVENT_STATUS:
@@ -689,7 +689,7 @@ static int _cal_record_event_set_int(calendar_record_h record, unsigned int prop
        case CAL_PROPERTY_EVENT_ID:
                (rec->index) = value;
                break;
-       case CAL_PROPERTY_EVENT_CALENDAR_ID:
+       case CAL_PROPERTY_EVENT_BOOK_ID:
                (rec->calendar_id) = value;
                break;
        case CAL_PROPERTY_EVENT_EVENT_STATUS:
diff --git a/common/cal_record_instance_allday.c b/common/cal_record_instance_allday.c
deleted file mode 100644 (file)
index fbeb1ae..0000000
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Calendar Service
- *
- * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "cal_internal.h"
-#include "cal_typedef.h"
-#include "cal_view.h"
-#include "cal_record.h"
-#include "cal_utils.h"
-
-static int _cal_record_instance_allday_create(calendar_record_h* out_record);
-static int _cal_record_instance_allday_destroy(calendar_record_h record, bool delete_child);
-static int _cal_record_instance_allday_clone(calendar_record_h record, calendar_record_h* out_record);
-static int _cal_record_instance_allday_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_allday_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_allday_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
-static int _cal_record_instance_allday_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
-static int _cal_record_instance_allday_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
-static int _cal_record_instance_allday_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
-static int _cal_record_instance_allday_set_str(calendar_record_h record, unsigned int property_id, const char* value);
-static int _cal_record_instance_allday_set_int(calendar_record_h record, unsigned int property_id, int value);
-static int _cal_record_instance_allday_set_double(calendar_record_h record, unsigned int property_id, double value);
-static int _cal_record_instance_allday_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
-
-cal_record_plugin_cb_s cal_record_instance_allday_plugin_cb = {
-       .create = _cal_record_instance_allday_create,
-       .destroy = _cal_record_instance_allday_destroy,
-       .clone = _cal_record_instance_allday_clone,
-       .get_str = _cal_record_instance_allday_get_str,
-       .get_str_p = _cal_record_instance_allday_get_str_p,
-       .get_int = _cal_record_instance_allday_get_int,
-       .get_double = _cal_record_instance_allday_get_double,
-       .get_lli = _cal_record_instance_allday_get_lli,
-       .get_caltime = _cal_record_instance_allday_get_caltime,
-       .set_str = _cal_record_instance_allday_set_str,
-       .set_int = _cal_record_instance_allday_set_int,
-       .set_double = _cal_record_instance_allday_set_double,
-       .set_lli = NULL,
-       .set_caltime = _cal_record_instance_allday_set_caltime,
-       .add_child_record = NULL,
-       .remove_child_record = NULL,
-       .get_child_record_count = NULL,
-       .get_child_record_at_p = NULL,
-       .clone_child_record_list = NULL
-};
-
-static void _cal_record_instance_allday_struct_init(cal_instance_allday_s* record)
-{
-       memset(record, 0, sizeof(cal_instance_allday_s));
-
-       record->event_status = CALENDAR_EVENT_STATUS_NONE;
-       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
-       record->event_id = CAL_INVALID_ID;
-
-       record->busy_status = 2;
-       record->summary = NULL;
-       record->description = NULL;
-       record->location = NULL;
-
-       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-
-       return;
-}
-
-static int _cal_record_instance_allday_create(calendar_record_h* out_record)
-{
-       cal_instance_allday_s *temp = NULL;
-       int ret = CALENDAR_ERROR_NONE;
-
-       temp = calloc(1, sizeof(cal_instance_allday_s));
-       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       _cal_record_instance_allday_struct_init(temp);
-
-       *out_record = (calendar_record_h)temp;
-
-       return ret;
-}
-
-static void _cal_record_instance_allday_struct_free(cal_instance_allday_s *record)
-{
-       CAL_FREE(record->summary);
-       CAL_FREE(record->description);
-       CAL_FREE(record->location);
-       CAL_FREE(record->sync_data1);
-
-       CAL_FREE(record);
-}
-
-static int _cal_record_instance_allday_destroy(calendar_record_h record, bool delete_child)
-{
-       int ret = CALENDAR_ERROR_NONE;
-
-       cal_instance_allday_s *temp = (cal_instance_allday_s*)(record);
-
-       _cal_record_instance_allday_struct_free(temp);
-
-       return ret;
-}
-
-static int _cal_record_instance_allday_clone(calendar_record_h record, calendar_record_h* out_record)
-{
-       cal_instance_allday_s *out_data = NULL;
-       cal_instance_allday_s *src_data = NULL;
-
-       src_data = (cal_instance_allday_s*)(record);
-
-       out_data = calloc(1, sizeof(cal_instance_allday_s));
-       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
-
-       out_data->event_id = src_data->event_id;
-       out_data->calendar_id = src_data->calendar_id;
-       out_data->start = src_data->start;
-       out_data->end = src_data->end;
-       out_data->summary = cal_strdup(src_data->summary);
-       out_data->description = cal_strdup(src_data->description);
-       out_data->location = cal_strdup(src_data->location);
-       out_data->busy_status = src_data->busy_status;
-       out_data->event_status = src_data->event_status;
-       out_data->priority = src_data->priority;
-       out_data->sensitivity = src_data->sensitivity;
-       out_data->has_rrule = src_data->has_rrule;
-       out_data->latitude = src_data->latitude;
-       out_data->longitude = src_data->longitude;
-       out_data->has_alarm = src_data->has_alarm;
-       out_data->original_event_id = src_data->original_event_id;
-       out_data->last_mod = src_data->last_mod;
-       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
-
-       *out_record = (calendar_record_h)out_data;
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY:
-               *out_str = cal_strdup(rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION:
-               *out_str = cal_strdup(rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION:
-               *out_str = cal_strdup(rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1:
-               *out_str = cal_strdup(rec->sync_data1);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY:
-               *out_str = (rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION:
-               *out_str = (rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION:
-               *out_str = (rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1:
-               *out_str = (rec->sync_data1);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_ID:
-               *out_value = (rec->event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_CALENDAR_ID:
-               *out_value = (rec->calendar_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_BUSY_STATUS:
-               *out_value = (rec->busy_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_STATUS:
-               *out_value = (rec->event_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_PRIORITY:
-               *out_value = (rec->priority);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SENSITIVITY:
-               *out_value = (rec->sensitivity);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_HAS_RRULE:
-               *out_value = (rec->has_rrule);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_HAS_ALARM:
-               *out_value = (rec->has_alarm);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_ORIGINAL_EVENT_ID:
-               *out_value = (rec->original_event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_IS_ALLDAY:
-               *out_value = (rec->is_allday);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LATITUDE:
-               *out_value = (rec->latitude);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LONGITUDE:
-               *out_value = (rec->longitude);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LAST_MODIFIED_TIME:
-               *out_value = (rec->last_mod);
-               break;
-       default:
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_START:
-               *out_value = rec->start;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_END:
-               *out_value = rec->end;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_set_str(calendar_record_h record, unsigned int property_id, const char* value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY:
-               CAL_FREE(rec->summary);
-               rec->summary = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION:
-               CAL_FREE(rec->description);
-               rec->description = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION:
-               CAL_FREE(rec->location);
-               rec->location = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1:
-               CAL_FREE(rec->sync_data1);
-               rec->sync_data1 = cal_strdup(value);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_set_int(calendar_record_h record, unsigned int property_id, int value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_ID:
-               (rec->event_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_CALENDAR_ID:
-               (rec->calendar_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_BUSY_STATUS:
-               (rec->busy_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_STATUS:
-               (rec->event_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_PRIORITY:
-               (rec->priority) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SENSITIVITY:
-               (rec->sensitivity) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_HAS_RRULE:
-               (rec->has_rrule) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_HAS_ALARM:
-               (rec->has_alarm) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_ORIGINAL_EVENT_ID:
-               (rec->original_event_id) = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_set_double(calendar_record_h record, unsigned int property_id, double value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LATITUDE:
-               (rec->latitude) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LONGITUDE:
-               (rec->longitude) = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
-{
-       cal_instance_allday_s *rec = (cal_instance_allday_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_START:
-               rec->start = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_END:
-               rec->end = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
diff --git a/common/cal_record_instance_allday_extended.c b/common/cal_record_instance_allday_extended.c
deleted file mode 100644 (file)
index 74f8e07..0000000
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Calendar Service
- *
- * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "cal_internal.h"
-#include "cal_typedef.h"
-#include "cal_view.h"
-#include "cal_record.h"
-#include "cal_utils.h"
-
-static int _cal_record_instance_allday_extended_create(calendar_record_h* out_record);
-static int _cal_record_instance_allday_extended_destroy(calendar_record_h record, bool delete_child);
-static int _cal_record_instance_allday_extended_clone(calendar_record_h record, calendar_record_h* out_record);
-static int _cal_record_instance_allday_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_allday_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_allday_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
-static int _cal_record_instance_allday_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
-static int _cal_record_instance_allday_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
-static int _cal_record_instance_allday_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
-static int _cal_record_instance_allday_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value);
-static int _cal_record_instance_allday_extended_set_int(calendar_record_h record, unsigned int property_id, int value);
-static int _cal_record_instance_allday_extended_set_double(calendar_record_h record, unsigned int property_id, double value);
-static int _cal_record_instance_allday_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
-
-cal_record_plugin_cb_s cal_record_instance_allday_extended_plugin_cb = {
-       .create = _cal_record_instance_allday_extended_create,
-       .destroy = _cal_record_instance_allday_extended_destroy,
-       .clone = _cal_record_instance_allday_extended_clone,
-       .get_str = _cal_record_instance_allday_extended_get_str,
-       .get_str_p = _cal_record_instance_allday_extended_get_str_p,
-       .get_int = _cal_record_instance_allday_extended_get_int,
-       .get_double = _cal_record_instance_allday_extended_get_double,
-       .get_lli = _cal_record_instance_allday_extended_get_lli,
-       .get_caltime = _cal_record_instance_allday_extended_get_caltime,
-       .set_str = _cal_record_instance_allday_extended_set_str,
-       .set_int = _cal_record_instance_allday_extended_set_int,
-       .set_double = _cal_record_instance_allday_extended_set_double,
-       .set_lli = NULL,
-       .set_caltime = _cal_record_instance_allday_extended_set_caltime,
-       .add_child_record = NULL,
-       .remove_child_record = NULL,
-       .get_child_record_count = NULL,
-       .get_child_record_at_p = NULL,
-       .clone_child_record_list = NULL
-};
-
-static void _cal_record_instance_allday_extended_struct_init(cal_instance_allday_extended_s* record)
-{
-       memset(record, 0, sizeof(cal_instance_allday_extended_s));
-
-       record->event_status = CALENDAR_EVENT_STATUS_NONE;
-       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
-       record->event_id = CAL_INVALID_ID;
-
-       record->busy_status = 2;
-       record->summary = NULL;
-       record->description = NULL;
-       record->location = NULL;
-
-       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-
-       return;
-}
-
-static int _cal_record_instance_allday_extended_create(calendar_record_h* out_record)
-{
-       cal_instance_allday_extended_s *temp = NULL;
-       int ret = CALENDAR_ERROR_NONE;
-
-       temp = calloc(1, sizeof(cal_instance_allday_extended_s));
-       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       _cal_record_instance_allday_extended_struct_init(temp);
-
-       *out_record = (calendar_record_h)temp;
-
-       return ret;
-}
-
-static void _cal_record_instance_allday_extended_struct_free(cal_instance_allday_extended_s *record)
-{
-       CAL_FREE(record->summary);
-       CAL_FREE(record->description);
-       CAL_FREE(record->location);
-       CAL_FREE(record->organizer_name);
-       CAL_FREE(record->categories);
-       CAL_FREE(record->sync_data1);
-       CAL_FREE(record->sync_data2);
-       CAL_FREE(record->sync_data3);
-       CAL_FREE(record->sync_data4);
-
-       CAL_FREE(record);
-}
-
-static int _cal_record_instance_allday_extended_destroy(calendar_record_h record, bool delete_child)
-{
-       int ret = CALENDAR_ERROR_NONE;
-
-       cal_instance_allday_extended_s *temp = (cal_instance_allday_extended_s*)(record);
-
-       _cal_record_instance_allday_extended_struct_free(temp);
-
-       return ret;
-}
-
-static int _cal_record_instance_allday_extended_clone(calendar_record_h record, calendar_record_h* out_record)
-{
-       cal_instance_allday_extended_s *out_data = NULL;
-       cal_instance_allday_extended_s *src_data = NULL;
-
-       src_data = (cal_instance_allday_extended_s*)(record);
-
-       out_data = calloc(1, sizeof(cal_instance_allday_extended_s));
-       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
-
-       out_data->event_id = src_data->event_id;
-       out_data->calendar_id = src_data->calendar_id;
-       out_data->start = src_data->start;
-       out_data->end = src_data->end;
-       out_data->summary = cal_strdup(src_data->summary);
-       out_data->description = cal_strdup(src_data->description);
-       out_data->location = cal_strdup(src_data->location);
-       out_data->busy_status = src_data->busy_status;
-       out_data->event_status = src_data->event_status;
-       out_data->priority = src_data->priority;
-       out_data->sensitivity = src_data->sensitivity;
-       out_data->has_rrule = src_data->has_rrule;
-       out_data->latitude = src_data->latitude;
-       out_data->longitude = src_data->longitude;
-       out_data->has_alarm = src_data->has_alarm;
-       out_data->original_event_id = src_data->original_event_id;
-       out_data->last_mod = src_data->last_mod;
-       out_data->organizer_name = cal_strdup(src_data->organizer_name);
-       out_data->categories = cal_strdup(src_data->categories);
-       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
-       out_data->sync_data2 = cal_strdup(src_data->sync_data2);
-       out_data->sync_data3 = cal_strdup(src_data->sync_data3);
-       out_data->sync_data4 = cal_strdup(src_data->sync_data4);
-
-       *out_record = (calendar_record_h)out_data;
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY:
-               *out_str = cal_strdup(rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION:
-               *out_str = cal_strdup(rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION:
-               *out_str = cal_strdup(rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1:
-               *out_str = cal_strdup(rec->sync_data1);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME:
-               *out_str = cal_strdup(rec->organizer_name);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES:
-               *out_str = cal_strdup(rec->categories);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2:
-               *out_str = cal_strdup(rec->sync_data2);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3:
-               *out_str = cal_strdup(rec->sync_data3);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4:
-               *out_str = cal_strdup(rec->sync_data4);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY:
-               *out_str = (rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION:
-               *out_str = (rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION:
-               *out_str = (rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1:
-               *out_str = (rec->sync_data1);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME:
-               *out_str = (rec->organizer_name);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES:
-               *out_str = (rec->categories);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2:
-               *out_str = (rec->sync_data2);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3:
-               *out_str = (rec->sync_data3);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4:
-               *out_str = (rec->sync_data4);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_ID:
-               *out_value = (rec->event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CALENDAR_ID:
-               *out_value = (rec->calendar_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_BUSY_STATUS:
-               *out_value = (rec->busy_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_STATUS:
-               *out_value = (rec->event_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_PRIORITY:
-               *out_value = (rec->priority);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SENSITIVITY:
-               *out_value = (rec->sensitivity);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_RRULE:
-               *out_value = (rec->has_rrule);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ALARM:
-               *out_value = (rec->has_alarm);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORIGINAL_EVENT_ID:
-               *out_value = (rec->original_event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ATTENDEE:
-               *out_value = (rec->has_attendee);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_IS_ALLDAY:
-               *out_value = (rec->is_allday);
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LATITUDE:
-               *out_value = (rec->latitude);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LONGITUDE:
-               *out_value = (rec->longitude);
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LAST_MODIFIED_TIME:
-               *out_value = (rec->last_mod);
-               break;
-       default:
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_START:
-               *out_value = rec->start;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_END:
-               *out_value = rec->end;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY:
-               CAL_FREE(rec->summary);
-               rec->summary = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION:
-               CAL_FREE(rec->description);
-               rec->description = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION:
-               CAL_FREE(rec->location);
-               rec->location = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1:
-               CAL_FREE(rec->sync_data1);
-               rec->sync_data1 = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME:
-               CAL_FREE(rec->organizer_name);
-               rec->organizer_name = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES:
-               CAL_FREE(rec->categories);
-               rec->categories = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2:
-               CAL_FREE(rec->sync_data2);
-               rec->sync_data2 = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3:
-               CAL_FREE(rec->sync_data3);
-               rec->sync_data3 = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4:
-               CAL_FREE(rec->sync_data4);
-               rec->sync_data4 = cal_strdup(value);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_set_int(calendar_record_h record, unsigned int property_id, int value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_ID:
-               (rec->event_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CALENDAR_ID:
-               (rec->calendar_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_BUSY_STATUS:
-               (rec->busy_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_STATUS:
-               (rec->event_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_PRIORITY:
-               (rec->priority) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SENSITIVITY:
-               (rec->sensitivity) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_RRULE:
-               (rec->has_rrule) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ALARM:
-               (rec->has_alarm) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORIGINAL_EVENT_ID:
-               (rec->original_event_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ATTENDEE:
-               (rec->has_attendee) = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_set_double(calendar_record_h record, unsigned int property_id, double value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LATITUDE:
-               (rec->latitude) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LONGITUDE:
-               (rec->longitude) = value;
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_allday_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
-{
-       cal_instance_allday_extended_s *rec = (cal_instance_allday_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_START:
-               rec->start = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_END:
-               rec->end = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
diff --git a/common/cal_record_instance_localtime.c b/common/cal_record_instance_localtime.c
new file mode 100644 (file)
index 0000000..ba7fb9a
--- /dev/null
@@ -0,0 +1,416 @@
+/*
+ * Calendar Service
+ *
+ * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "cal_internal.h"
+#include "cal_typedef.h"
+#include "cal_view.h"
+#include "cal_record.h"
+#include "cal_utils.h"
+
+static int _cal_record_instance_localtime_create(calendar_record_h* out_record);
+static int _cal_record_instance_localtime_destroy(calendar_record_h record, bool delete_child);
+static int _cal_record_instance_localtime_clone(calendar_record_h record, calendar_record_h* out_record);
+static int _cal_record_instance_localtime_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_localtime_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_localtime_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
+static int _cal_record_instance_localtime_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
+static int _cal_record_instance_localtime_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
+static int _cal_record_instance_localtime_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
+static int _cal_record_instance_localtime_set_str(calendar_record_h record, unsigned int property_id, const char* value);
+static int _cal_record_instance_localtime_set_int(calendar_record_h record, unsigned int property_id, int value);
+static int _cal_record_instance_localtime_set_double(calendar_record_h record, unsigned int property_id, double value);
+static int _cal_record_instance_localtime_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
+
+cal_record_plugin_cb_s cal_record_instance_localtime_plugin_cb = {
+       .create = _cal_record_instance_localtime_create,
+       .destroy = _cal_record_instance_localtime_destroy,
+       .clone = _cal_record_instance_localtime_clone,
+       .get_str = _cal_record_instance_localtime_get_str,
+       .get_str_p = _cal_record_instance_localtime_get_str_p,
+       .get_int = _cal_record_instance_localtime_get_int,
+       .get_double = _cal_record_instance_localtime_get_double,
+       .get_lli = _cal_record_instance_localtime_get_lli,
+       .get_caltime = _cal_record_instance_localtime_get_caltime,
+       .set_str = _cal_record_instance_localtime_set_str,
+       .set_int = _cal_record_instance_localtime_set_int,
+       .set_double = _cal_record_instance_localtime_set_double,
+       .set_lli = NULL,
+       .set_caltime = _cal_record_instance_localtime_set_caltime,
+       .add_child_record = NULL,
+       .remove_child_record = NULL,
+       .get_child_record_count = NULL,
+       .get_child_record_at_p = NULL,
+       .clone_child_record_list = NULL
+};
+
+static void _cal_record_instance_localtime_struct_init(cal_instance_localtime_s* record)
+{
+       memset(record, 0, sizeof(cal_instance_localtime_s));
+
+       record->event_status = CALENDAR_EVENT_STATUS_NONE;
+       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
+       record->event_id = CAL_INVALID_ID;
+
+       record->busy_status = 2;
+       record->summary = NULL;
+       record->description = NULL;
+       record->location = NULL;
+
+       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+
+       return;
+}
+
+static int _cal_record_instance_localtime_create(calendar_record_h* out_record)
+{
+       cal_instance_localtime_s *temp = NULL;
+       int ret = CALENDAR_ERROR_NONE;
+
+       temp = calloc(1, sizeof(cal_instance_localtime_s));
+       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       _cal_record_instance_localtime_struct_init(temp);
+
+       *out_record = (calendar_record_h)temp;
+
+       return ret;
+}
+
+static void _cal_record_instance_localtime_struct_free(cal_instance_localtime_s *record)
+{
+       CAL_FREE(record->summary);
+       CAL_FREE(record->description);
+       CAL_FREE(record->location);
+       CAL_FREE(record->sync_data1);
+
+       CAL_FREE(record);
+}
+
+static int _cal_record_instance_localtime_destroy(calendar_record_h record, bool delete_child)
+{
+       int ret = CALENDAR_ERROR_NONE;
+
+       cal_instance_localtime_s *temp = (cal_instance_localtime_s*)(record);
+
+       _cal_record_instance_localtime_struct_free(temp);
+
+       return ret;
+}
+
+static int _cal_record_instance_localtime_clone(calendar_record_h record, calendar_record_h* out_record)
+{
+       cal_instance_localtime_s *out_data = NULL;
+       cal_instance_localtime_s *src_data = NULL;
+
+       src_data = (cal_instance_localtime_s*)(record);
+
+       out_data = calloc(1, sizeof(cal_instance_localtime_s));
+       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
+
+       out_data->event_id = src_data->event_id;
+       out_data->calendar_id = src_data->calendar_id;
+       out_data->start = src_data->start;
+       out_data->end = src_data->end;
+       out_data->summary = cal_strdup(src_data->summary);
+       out_data->description = cal_strdup(src_data->description);
+       out_data->location = cal_strdup(src_data->location);
+       out_data->busy_status = src_data->busy_status;
+       out_data->event_status = src_data->event_status;
+       out_data->priority = src_data->priority;
+       out_data->sensitivity = src_data->sensitivity;
+       out_data->has_rrule = src_data->has_rrule;
+       out_data->latitude = src_data->latitude;
+       out_data->longitude = src_data->longitude;
+       out_data->has_alarm = src_data->has_alarm;
+       out_data->original_event_id = src_data->original_event_id;
+       out_data->last_mod = src_data->last_mod;
+       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
+
+       *out_record = (calendar_record_h)out_data;
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY:
+               *out_str = cal_strdup(rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION:
+               *out_str = cal_strdup(rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION:
+               *out_str = cal_strdup(rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1:
+               *out_str = cal_strdup(rec->sync_data1);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY:
+               *out_str = (rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION:
+               *out_str = (rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION:
+               *out_str = (rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1:
+               *out_str = (rec->sync_data1);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_ID:
+               *out_value = (rec->event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_BOOK_ID:
+               *out_value = (rec->calendar_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_BUSY_STATUS:
+               *out_value = (rec->busy_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_STATUS:
+               *out_value = (rec->event_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_PRIORITY:
+               *out_value = (rec->priority);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SENSITIVITY:
+               *out_value = (rec->sensitivity);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_RRULE:
+               *out_value = (rec->has_rrule);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_ALARM:
+               *out_value = (rec->has_alarm);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_ORIGINAL_EVENT_ID:
+               *out_value = (rec->original_event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_IS_ALLDAY:
+               *out_value = (rec->is_allday);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LATITUDE:
+               *out_value = (rec->latitude);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LONGITUDE:
+               *out_value = (rec->longitude);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LAST_MODIFIED_TIME:
+               *out_value = (rec->last_mod);
+               break;
+       default:
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_START:
+               *out_value = rec->start;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_END:
+               *out_value = rec->end;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_set_str(calendar_record_h record, unsigned int property_id, const char* value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY:
+               CAL_FREE(rec->summary);
+               rec->summary = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION:
+               CAL_FREE(rec->description);
+               rec->description = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION:
+               CAL_FREE(rec->location);
+               rec->location = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1:
+               CAL_FREE(rec->sync_data1);
+               rec->sync_data1 = cal_strdup(value);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_set_int(calendar_record_h record, unsigned int property_id, int value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_ID:
+               (rec->event_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_BOOK_ID:
+               (rec->calendar_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_BUSY_STATUS:
+               (rec->busy_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_STATUS:
+               (rec->event_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_PRIORITY:
+               (rec->priority) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SENSITIVITY:
+               (rec->sensitivity) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_RRULE:
+               (rec->has_rrule) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_ALARM:
+               (rec->has_alarm) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_ORIGINAL_EVENT_ID:
+               (rec->original_event_id) = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_set_double(calendar_record_h record, unsigned int property_id, double value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LATITUDE:
+               (rec->latitude) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LONGITUDE:
+               (rec->longitude) = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
+{
+       cal_instance_localtime_s *rec = (cal_instance_localtime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_START:
+               rec->start = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_END:
+               rec->end = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
diff --git a/common/cal_record_instance_localtime_extended.c b/common/cal_record_instance_localtime_extended.c
new file mode 100644 (file)
index 0000000..50ce4ee
--- /dev/null
@@ -0,0 +1,485 @@
+/*
+ * Calendar Service
+ *
+ * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "cal_internal.h"
+#include "cal_typedef.h"
+#include "cal_view.h"
+#include "cal_record.h"
+#include "cal_utils.h"
+
+static int _cal_record_instance_localtime_extended_create(calendar_record_h* out_record);
+static int _cal_record_instance_localtime_extended_destroy(calendar_record_h record, bool delete_child);
+static int _cal_record_instance_localtime_extended_clone(calendar_record_h record, calendar_record_h* out_record);
+static int _cal_record_instance_localtime_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_localtime_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_localtime_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
+static int _cal_record_instance_localtime_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
+static int _cal_record_instance_localtime_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
+static int _cal_record_instance_localtime_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
+static int _cal_record_instance_localtime_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value);
+static int _cal_record_instance_localtime_extended_set_int(calendar_record_h record, unsigned int property_id, int value);
+static int _cal_record_instance_localtime_extended_set_double(calendar_record_h record, unsigned int property_id, double value);
+static int _cal_record_instance_localtime_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
+
+cal_record_plugin_cb_s cal_record_instance_localtime_extended_plugin_cb = {
+       .create = _cal_record_instance_localtime_extended_create,
+       .destroy = _cal_record_instance_localtime_extended_destroy,
+       .clone = _cal_record_instance_localtime_extended_clone,
+       .get_str = _cal_record_instance_localtime_extended_get_str,
+       .get_str_p = _cal_record_instance_localtime_extended_get_str_p,
+       .get_int = _cal_record_instance_localtime_extended_get_int,
+       .get_double = _cal_record_instance_localtime_extended_get_double,
+       .get_lli = _cal_record_instance_localtime_extended_get_lli,
+       .get_caltime = _cal_record_instance_localtime_extended_get_caltime,
+       .set_str = _cal_record_instance_localtime_extended_set_str,
+       .set_int = _cal_record_instance_localtime_extended_set_int,
+       .set_double = _cal_record_instance_localtime_extended_set_double,
+       .set_lli = NULL,
+       .set_caltime = _cal_record_instance_localtime_extended_set_caltime,
+       .add_child_record = NULL,
+       .remove_child_record = NULL,
+       .get_child_record_count = NULL,
+       .get_child_record_at_p = NULL,
+       .clone_child_record_list = NULL
+};
+
+static void _cal_record_instance_localtime_extended_struct_init(cal_instance_localtime_extended_s* record)
+{
+       memset(record, 0, sizeof(cal_instance_localtime_extended_s));
+
+       record->event_status = CALENDAR_EVENT_STATUS_NONE;
+       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
+       record->event_id = CAL_INVALID_ID;
+
+       record->busy_status = 2;
+       record->summary = NULL;
+       record->description = NULL;
+       record->location = NULL;
+
+       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+
+       return;
+}
+
+static int _cal_record_instance_localtime_extended_create(calendar_record_h* out_record)
+{
+       cal_instance_localtime_extended_s *temp = NULL;
+       int ret = CALENDAR_ERROR_NONE;
+
+       temp = calloc(1, sizeof(cal_instance_localtime_extended_s));
+       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       _cal_record_instance_localtime_extended_struct_init(temp);
+
+       *out_record = (calendar_record_h)temp;
+
+       return ret;
+}
+
+static void _cal_record_instance_localtime_extended_struct_free(cal_instance_localtime_extended_s *record)
+{
+       CAL_FREE(record->summary);
+       CAL_FREE(record->description);
+       CAL_FREE(record->location);
+       CAL_FREE(record->organizer_name);
+       CAL_FREE(record->categories);
+       CAL_FREE(record->sync_data1);
+       CAL_FREE(record->sync_data2);
+       CAL_FREE(record->sync_data3);
+       CAL_FREE(record->sync_data4);
+
+       CAL_FREE(record);
+}
+
+static int _cal_record_instance_localtime_extended_destroy(calendar_record_h record, bool delete_child)
+{
+       int ret = CALENDAR_ERROR_NONE;
+
+       cal_instance_localtime_extended_s *temp = (cal_instance_localtime_extended_s*)(record);
+
+       _cal_record_instance_localtime_extended_struct_free(temp);
+
+       return ret;
+}
+
+static int _cal_record_instance_localtime_extended_clone(calendar_record_h record, calendar_record_h* out_record)
+{
+       cal_instance_localtime_extended_s *out_data = NULL;
+       cal_instance_localtime_extended_s *src_data = NULL;
+
+       src_data = (cal_instance_localtime_extended_s*)(record);
+
+       out_data = calloc(1, sizeof(cal_instance_localtime_extended_s));
+       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
+
+       out_data->event_id = src_data->event_id;
+       out_data->calendar_id = src_data->calendar_id;
+       out_data->start = src_data->start;
+       out_data->end = src_data->end;
+       out_data->summary = cal_strdup(src_data->summary);
+       out_data->description = cal_strdup(src_data->description);
+       out_data->location = cal_strdup(src_data->location);
+       out_data->busy_status = src_data->busy_status;
+       out_data->event_status = src_data->event_status;
+       out_data->priority = src_data->priority;
+       out_data->sensitivity = src_data->sensitivity;
+       out_data->has_rrule = src_data->has_rrule;
+       out_data->latitude = src_data->latitude;
+       out_data->longitude = src_data->longitude;
+       out_data->has_alarm = src_data->has_alarm;
+       out_data->original_event_id = src_data->original_event_id;
+       out_data->last_mod = src_data->last_mod;
+       out_data->organizer_name = cal_strdup(src_data->organizer_name);
+       out_data->categories = cal_strdup(src_data->categories);
+       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
+       out_data->sync_data2 = cal_strdup(src_data->sync_data2);
+       out_data->sync_data3 = cal_strdup(src_data->sync_data3);
+       out_data->sync_data4 = cal_strdup(src_data->sync_data4);
+
+       *out_record = (calendar_record_h)out_data;
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY:
+               *out_str = cal_strdup(rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION:
+               *out_str = cal_strdup(rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION:
+               *out_str = cal_strdup(rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1:
+               *out_str = cal_strdup(rec->sync_data1);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME:
+               *out_str = cal_strdup(rec->organizer_name);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES:
+               *out_str = cal_strdup(rec->categories);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2:
+               *out_str = cal_strdup(rec->sync_data2);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3:
+               *out_str = cal_strdup(rec->sync_data3);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4:
+               *out_str = cal_strdup(rec->sync_data4);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY:
+               *out_str = (rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION:
+               *out_str = (rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION:
+               *out_str = (rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1:
+               *out_str = (rec->sync_data1);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME:
+               *out_str = (rec->organizer_name);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES:
+               *out_str = (rec->categories);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2:
+               *out_str = (rec->sync_data2);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3:
+               *out_str = (rec->sync_data3);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4:
+               *out_str = (rec->sync_data4);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_ID:
+               *out_value = (rec->event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BOOK_ID:
+               *out_value = (rec->calendar_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BUSY_STATUS:
+               *out_value = (rec->busy_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_STATUS:
+               *out_value = (rec->event_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_PRIORITY:
+               *out_value = (rec->priority);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SENSITIVITY:
+               *out_value = (rec->sensitivity);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_RRULE:
+               *out_value = (rec->has_rrule);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ALARM:
+               *out_value = (rec->has_alarm);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORIGINAL_EVENT_ID:
+               *out_value = (rec->original_event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ATTENDEE:
+               *out_value = (rec->has_attendee);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_IS_ALLDAY:
+               *out_value = (rec->is_allday);
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LATITUDE:
+               *out_value = (rec->latitude);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LONGITUDE:
+               *out_value = (rec->longitude);
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LAST_MODIFIED_TIME:
+               *out_value = (rec->last_mod);
+               break;
+       default:
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_START:
+               *out_value = rec->start;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_END:
+               *out_value = rec->end;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY:
+               CAL_FREE(rec->summary);
+               rec->summary = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION:
+               CAL_FREE(rec->description);
+               rec->description = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION:
+               CAL_FREE(rec->location);
+               rec->location = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1:
+               CAL_FREE(rec->sync_data1);
+               rec->sync_data1 = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME:
+               CAL_FREE(rec->organizer_name);
+               rec->organizer_name = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES:
+               CAL_FREE(rec->categories);
+               rec->categories = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2:
+               CAL_FREE(rec->sync_data2);
+               rec->sync_data2 = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3:
+               CAL_FREE(rec->sync_data3);
+               rec->sync_data3 = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4:
+               CAL_FREE(rec->sync_data4);
+               rec->sync_data4 = cal_strdup(value);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_set_int(calendar_record_h record, unsigned int property_id, int value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_ID:
+               (rec->event_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BOOK_ID:
+               (rec->calendar_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BUSY_STATUS:
+               (rec->busy_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_STATUS:
+               (rec->event_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_PRIORITY:
+               (rec->priority) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SENSITIVITY:
+               (rec->sensitivity) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_RRULE:
+               (rec->has_rrule) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ALARM:
+               (rec->has_alarm) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORIGINAL_EVENT_ID:
+               (rec->original_event_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ATTENDEE:
+               (rec->has_attendee) = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_set_double(calendar_record_h record, unsigned int property_id, double value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LATITUDE:
+               (rec->latitude) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LONGITUDE:
+               (rec->longitude) = value;
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_localtime_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
+{
+       cal_instance_localtime_extended_s *rec = (cal_instance_localtime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_START:
+               rec->start = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_END:
+               rec->end = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
diff --git a/common/cal_record_instance_normal.c b/common/cal_record_instance_normal.c
deleted file mode 100644 (file)
index ff93597..0000000
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Calendar Service
- *
- * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "cal_internal.h"
-#include "cal_typedef.h"
-#include "cal_view.h"
-#include "cal_record.h"
-#include "cal_utils.h"
-
-static int _cal_record_instance_normal_create(calendar_record_h* out_record);
-static int _cal_record_instance_normal_destroy(calendar_record_h record, bool delete_child);
-static int _cal_record_instance_normal_clone(calendar_record_h record, calendar_record_h* out_record);
-static int _cal_record_instance_normal_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_normal_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_normal_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
-static int _cal_record_instance_normal_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
-static int _cal_record_instance_normal_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
-static int _cal_record_instance_normal_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
-static int _cal_record_instance_normal_set_str(calendar_record_h record, unsigned int property_id, const char* value);
-static int _cal_record_instance_normal_set_int(calendar_record_h record, unsigned int property_id, int value);
-static int _cal_record_instance_normal_set_double(calendar_record_h record, unsigned int property_id, double value);
-static int _cal_record_instance_normal_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
-
-cal_record_plugin_cb_s cal_record_instance_normal_plugin_cb = {
-       .create = _cal_record_instance_normal_create,
-       .destroy = _cal_record_instance_normal_destroy,
-       .clone = _cal_record_instance_normal_clone,
-       .get_str = _cal_record_instance_normal_get_str,
-       .get_str_p = _cal_record_instance_normal_get_str_p,
-       .get_int = _cal_record_instance_normal_get_int,
-       .get_double = _cal_record_instance_normal_get_double,
-       .get_lli = _cal_record_instance_normal_get_lli,
-       .get_caltime = _cal_record_instance_normal_get_caltime,
-       .set_str = _cal_record_instance_normal_set_str,
-       .set_int = _cal_record_instance_normal_set_int,
-       .set_double = _cal_record_instance_normal_set_double,
-       .set_lli = NULL,
-       .set_caltime = _cal_record_instance_normal_set_caltime,
-       .add_child_record = NULL,
-       .remove_child_record = NULL,
-       .get_child_record_count = NULL,
-       .get_child_record_at_p = NULL,
-       .clone_child_record_list = NULL
-};
-
-static void _cal_record_instance_normal_struct_init(cal_instance_normal_s* record)
-{
-       memset(record, 0, sizeof(cal_instance_normal_s));
-
-       record->event_status = CALENDAR_EVENT_STATUS_NONE;
-       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
-       record->event_id = CAL_INVALID_ID;
-
-       record->busy_status = 2;
-       record->summary = NULL;
-       record->description = NULL;
-       record->location = NULL;
-
-       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-
-       return ;
-}
-
-static int _cal_record_instance_normal_create(calendar_record_h* out_record)
-{
-       cal_instance_normal_s *temp = NULL;
-       int ret = CALENDAR_ERROR_NONE;
-
-       temp = calloc(1, sizeof(cal_instance_normal_s));
-       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       _cal_record_instance_normal_struct_init(temp);
-
-       *out_record = (calendar_record_h)temp;
-
-       return ret;
-}
-
-static void _cal_record_instance_normal_struct_free(cal_instance_normal_s *record)
-{
-       CAL_FREE(record->summary);
-       CAL_FREE(record->description);
-       CAL_FREE(record->location);
-       CAL_FREE(record->sync_data1);
-
-       CAL_FREE(record);
-}
-
-static int _cal_record_instance_normal_destroy(calendar_record_h record, bool delete_child)
-{
-       cal_instance_normal_s *temp = (cal_instance_normal_s*)(record);
-
-       _cal_record_instance_normal_struct_free(temp);
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_clone(calendar_record_h record, calendar_record_h* out_record)
-{
-       cal_instance_normal_s *out_data = NULL;
-       cal_instance_normal_s *src_data = NULL;
-
-       src_data = (cal_instance_normal_s*)(record);
-
-       out_data = calloc(1, sizeof(cal_instance_normal_s));
-       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
-
-       out_data->event_id = src_data->event_id;
-       out_data->calendar_id = src_data->calendar_id;
-       out_data->start = src_data->start;
-       out_data->end = src_data->end;
-       out_data->summary = cal_strdup(src_data->summary);
-       out_data->description = cal_strdup(src_data->description);
-       out_data->location = cal_strdup(src_data->location);
-       out_data->busy_status = src_data->busy_status;
-       out_data->event_status = src_data->event_status;
-       out_data->priority = src_data->priority;
-       out_data->sensitivity = src_data->sensitivity;
-       out_data->has_rrule = src_data->has_rrule;
-       out_data->latitude = src_data->latitude;
-       out_data->longitude = src_data->longitude;
-       out_data->has_alarm = src_data->has_alarm;
-       out_data->original_event_id = src_data->original_event_id;
-       out_data->last_mod = src_data->last_mod;
-       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
-
-       *out_record = (calendar_record_h)out_data;
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY:
-               *out_str = cal_strdup(rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION:
-               *out_str = cal_strdup(rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LOCATION:
-               *out_str = cal_strdup(rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1:
-               *out_str = cal_strdup(rec->sync_data1);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY:
-               *out_str = (rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION:
-               *out_str = (rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LOCATION:
-               *out_str = (rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1:
-               *out_str = (rec->sync_data1);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EVENT_ID:
-               *out_value = (rec->event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_CALENDAR_ID:
-               *out_value = (rec->calendar_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_BUSY_STATUS:
-               *out_value = (rec->busy_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EVENT_STATUS:
-               *out_value = (rec->event_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_PRIORITY:
-               *out_value = (rec->priority);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SENSITIVITY:
-               *out_value = (rec->sensitivity);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_HAS_RRULE:
-               *out_value = (rec->has_rrule);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_HAS_ALARM:
-               *out_value = (rec->has_alarm);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_ORIGINAL_EVENT_ID:
-               *out_value = (rec->original_event_id);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_LATITUDE:
-               *out_value = (rec->latitude);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LONGITUDE:
-               *out_value = (rec->longitude);
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_LAST_MODIFIED_TIME:
-               *out_value = (rec->last_mod);
-               break;
-       default:
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_START:
-               *out_value = rec->start;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_END:
-               *out_value = rec->end;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_set_str(calendar_record_h record, unsigned int property_id, const char* value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY:
-               CAL_FREE(rec->summary);
-               rec->summary = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION:
-               CAL_FREE(rec->description);
-               rec->description = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LOCATION:
-               CAL_FREE(rec->location);
-               rec->location = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1:
-               CAL_FREE(rec->sync_data1);
-               rec->sync_data1 = cal_strdup(value);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_set_int(calendar_record_h record, unsigned int property_id, int value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EVENT_ID:
-               (rec->event_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_CALENDAR_ID:
-               (rec->calendar_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_BUSY_STATUS:
-               (rec->busy_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EVENT_STATUS:
-               (rec->event_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_PRIORITY:
-               (rec->priority) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SENSITIVITY:
-               (rec->sensitivity) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_HAS_RRULE:
-               (rec->has_rrule) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_HAS_ALARM:
-               (rec->has_alarm) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_ORIGINAL_EVENT_ID:
-               (rec->original_event_id) = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_set_double(calendar_record_h record, unsigned int property_id, double value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_LATITUDE:
-               (rec->latitude) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LONGITUDE:
-               (rec->longitude) = value;
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
-{
-       cal_instance_normal_s *rec = (cal_instance_normal_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_START:
-               rec->start = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_END:
-               rec->end = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
diff --git a/common/cal_record_instance_normal_extended.c b/common/cal_record_instance_normal_extended.c
deleted file mode 100644 (file)
index 367ac1f..0000000
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Calendar Service
- *
- * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "cal_internal.h"
-#include "cal_typedef.h"
-#include "cal_view.h"
-#include "cal_record.h"
-#include "cal_utils.h"
-
-static int _cal_record_instance_normal_extended_create(calendar_record_h* out_record);
-static int _cal_record_instance_normal_extended_destroy(calendar_record_h record, bool delete_child);
-static int _cal_record_instance_normal_extended_clone(calendar_record_h record, calendar_record_h* out_record);
-static int _cal_record_instance_normal_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_normal_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
-static int _cal_record_instance_normal_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
-static int _cal_record_instance_normal_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
-static int _cal_record_instance_normal_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
-static int _cal_record_instance_normal_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
-static int _cal_record_instance_normal_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value);
-static int _cal_record_instance_normal_extended_set_int(calendar_record_h record, unsigned int property_id, int value);
-static int _cal_record_instance_normal_extended_set_double(calendar_record_h record, unsigned int property_id, double value);
-static int _cal_record_instance_normal_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
-
-cal_record_plugin_cb_s cal_record_instance_normal_extended_plugin_cb = {
-       .create = _cal_record_instance_normal_extended_create,
-       .destroy = _cal_record_instance_normal_extended_destroy,
-       .clone = _cal_record_instance_normal_extended_clone,
-       .get_str = _cal_record_instance_normal_extended_get_str,
-       .get_str_p = _cal_record_instance_normal_extended_get_str_p,
-       .get_int = _cal_record_instance_normal_extended_get_int,
-       .get_double = _cal_record_instance_normal_extended_get_double,
-       .get_lli = _cal_record_instance_normal_extended_get_lli,
-       .get_caltime = _cal_record_instance_normal_extended_get_caltime,
-       .set_str = _cal_record_instance_normal_extended_set_str,
-       .set_int = _cal_record_instance_normal_extended_set_int,
-       .set_double = _cal_record_instance_normal_extended_set_double,
-       .set_lli = NULL,
-       .set_caltime = _cal_record_instance_normal_extended_set_caltime,
-       .add_child_record = NULL,
-       .remove_child_record = NULL,
-       .get_child_record_count = NULL,
-       .get_child_record_at_p = NULL,
-       .clone_child_record_list = NULL
-};
-
-static void _cal_record_instance_normal_extended_struct_init(cal_instance_normal_extended_s* record)
-{
-       memset(record, 0, sizeof(cal_instance_normal_extended_s));
-
-       record->event_status = CALENDAR_EVENT_STATUS_NONE;
-       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
-       record->event_id = CAL_INVALID_ID;
-
-       record->busy_status = 2;
-       record->summary = NULL;
-       record->description = NULL;
-       record->location = NULL;
-
-       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
-
-       return ;
-}
-
-static int _cal_record_instance_normal_extended_create(calendar_record_h* out_record)
-{
-       cal_instance_normal_extended_s *temp = NULL;
-       int ret = CALENDAR_ERROR_NONE;
-
-       temp = calloc(1, sizeof(cal_instance_normal_extended_s));
-       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       _cal_record_instance_normal_extended_struct_init(temp);
-
-       *out_record = (calendar_record_h)temp;
-
-       return ret;
-}
-
-static void _cal_record_instance_normal_extended_struct_free(cal_instance_normal_extended_s *record)
-{
-       CAL_FREE(record->summary);
-       CAL_FREE(record->description);
-       CAL_FREE(record->location);
-       CAL_FREE(record->organizer_name);
-       CAL_FREE(record->categories);
-       CAL_FREE(record->sync_data1);
-       CAL_FREE(record->sync_data2);
-       CAL_FREE(record->sync_data3);
-       CAL_FREE(record->sync_data4);
-
-       CAL_FREE(record);
-}
-
-static int _cal_record_instance_normal_extended_destroy(calendar_record_h record, bool delete_child)
-{
-       cal_instance_normal_extended_s *temp = (cal_instance_normal_extended_s*)(record);
-
-       _cal_record_instance_normal_extended_struct_free(temp);
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_clone(calendar_record_h record, calendar_record_h* out_record)
-{
-       cal_instance_normal_extended_s *out_data = NULL;
-       cal_instance_normal_extended_s *src_data = NULL;
-
-       src_data = (cal_instance_normal_extended_s*)(record);
-
-       out_data = calloc(1, sizeof(cal_instance_normal_extended_s));
-       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
-
-       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
-
-       out_data->event_id = src_data->event_id;
-       out_data->calendar_id = src_data->calendar_id;
-       out_data->start = src_data->start;
-       out_data->end = src_data->end;
-       out_data->summary = cal_strdup(src_data->summary);
-       out_data->description = cal_strdup(src_data->description);
-       out_data->location = cal_strdup(src_data->location);
-       out_data->busy_status = src_data->busy_status;
-       out_data->event_status = src_data->event_status;
-       out_data->priority = src_data->priority;
-       out_data->sensitivity = src_data->sensitivity;
-       out_data->has_rrule = src_data->has_rrule;
-       out_data->latitude = src_data->latitude;
-       out_data->longitude = src_data->longitude;
-       out_data->has_alarm = src_data->has_alarm;
-       out_data->original_event_id = src_data->original_event_id;
-       out_data->last_mod = src_data->last_mod;
-       out_data->organizer_name = cal_strdup(src_data->organizer_name);
-       out_data->categories = cal_strdup(src_data->categories);
-       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
-       out_data->sync_data2 = cal_strdup(src_data->sync_data2);
-       out_data->sync_data3 = cal_strdup(src_data->sync_data3);
-       out_data->sync_data4 = cal_strdup(src_data->sync_data4);
-
-       *out_record = (calendar_record_h)out_data;
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY:
-               *out_str = cal_strdup(rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION:
-               *out_str = cal_strdup(rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION:
-               *out_str = cal_strdup(rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1:
-               *out_str = cal_strdup(rec->sync_data1);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME:
-               *out_str = cal_strdup(rec->organizer_name);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES:
-               *out_str = cal_strdup(rec->categories);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2:
-               *out_str = cal_strdup(rec->sync_data2);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3:
-               *out_str = cal_strdup(rec->sync_data3);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4:
-               *out_str = cal_strdup(rec->sync_data4);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY:
-               *out_str = (rec->summary);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION:
-               *out_str = (rec->description);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION:
-               *out_str = (rec->location);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1:
-               *out_str = (rec->sync_data1);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME:
-               *out_str = (rec->organizer_name);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES:
-               *out_str = (rec->categories);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2:
-               *out_str = (rec->sync_data2);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3:
-               *out_str = (rec->sync_data3);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4:
-               *out_str = (rec->sync_data4);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_ID:
-               *out_value = (rec->event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CALENDAR_ID:
-               *out_value = (rec->calendar_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_BUSY_STATUS:
-               *out_value = (rec->busy_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_STATUS:
-               *out_value = (rec->event_status);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_PRIORITY:
-               *out_value = (rec->priority);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SENSITIVITY:
-               *out_value = (rec->sensitivity);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_RRULE:
-               *out_value = (rec->has_rrule);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ALARM:
-               *out_value = (rec->has_alarm);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORIGINAL_EVENT_ID:
-               *out_value = (rec->original_event_id);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ATTENDEE:
-               *out_value = (rec->has_attendee);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LATITUDE:
-               *out_value = (rec->latitude);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LONGITUDE:
-               *out_value = (rec->longitude);
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LAST_MODIFIED_TIME:
-               *out_value = (rec->last_mod);
-               break;
-       default:
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_START:
-               *out_value = rec->start;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_END:
-               *out_value = rec->end;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY:
-               CAL_FREE(rec->summary);
-               rec->summary = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION:
-               CAL_FREE(rec->description);
-               rec->description = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION:
-               CAL_FREE(rec->location);
-               rec->location = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1:
-               CAL_FREE(rec->sync_data1);
-               rec->sync_data1 = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME:
-               CAL_FREE(rec->organizer_name);
-               rec->organizer_name = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES:
-               CAL_FREE(rec->categories);
-               rec->categories = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2:
-               CAL_FREE(rec->sync_data2);
-               rec->sync_data2 = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3:
-               CAL_FREE(rec->sync_data3);
-               rec->sync_data3 = cal_strdup(value);
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4:
-               CAL_FREE(rec->sync_data4);
-               rec->sync_data4 = cal_strdup(value);
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_set_int(calendar_record_h record, unsigned int property_id, int value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_ID:
-               (rec->event_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CALENDAR_ID:
-               (rec->calendar_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_BUSY_STATUS:
-               (rec->busy_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_STATUS:
-               (rec->event_status) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_PRIORITY:
-               (rec->priority) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SENSITIVITY:
-               (rec->sensitivity) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_RRULE:
-               (rec->has_rrule) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ALARM:
-               (rec->has_alarm) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORIGINAL_EVENT_ID:
-               (rec->original_event_id) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ATTENDEE:
-               (rec->has_attendee) = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_set_double(calendar_record_h record, unsigned int property_id, double value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LATITUDE:
-               (rec->latitude) = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LONGITUDE:
-               (rec->longitude) = value;
-               break;
-
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
-
-static int _cal_record_instance_normal_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
-{
-       cal_instance_normal_extended_s *rec = (cal_instance_normal_extended_s*)(record);
-       switch (property_id) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_START:
-               rec->start = value;
-               break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_END:
-               rec->end = value;
-               break;
-       default:
-               /* LCOV_EXCL_START */
-               ERR("invalid parameter (property:0x%x)", property_id);
-               return CALENDAR_ERROR_INVALID_PARAMETER;
-               /* LCOV_EXCL_STOP */
-       }
-
-       return CALENDAR_ERROR_NONE;
-}
diff --git a/common/cal_record_instance_utime.c b/common/cal_record_instance_utime.c
new file mode 100644 (file)
index 0000000..9bb20c2
--- /dev/null
@@ -0,0 +1,414 @@
+/*
+ * Calendar Service
+ *
+ * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "cal_internal.h"
+#include "cal_typedef.h"
+#include "cal_view.h"
+#include "cal_record.h"
+#include "cal_utils.h"
+
+static int _cal_record_instance_utime_create(calendar_record_h* out_record);
+static int _cal_record_instance_utime_destroy(calendar_record_h record, bool delete_child);
+static int _cal_record_instance_utime_clone(calendar_record_h record, calendar_record_h* out_record);
+static int _cal_record_instance_utime_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_utime_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_utime_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
+static int _cal_record_instance_utime_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
+static int _cal_record_instance_utime_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
+static int _cal_record_instance_utime_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
+static int _cal_record_instance_utime_set_str(calendar_record_h record, unsigned int property_id, const char* value);
+static int _cal_record_instance_utime_set_int(calendar_record_h record, unsigned int property_id, int value);
+static int _cal_record_instance_utime_set_double(calendar_record_h record, unsigned int property_id, double value);
+static int _cal_record_instance_utime_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
+
+cal_record_plugin_cb_s cal_record_instance_utime_plugin_cb = {
+       .create = _cal_record_instance_utime_create,
+       .destroy = _cal_record_instance_utime_destroy,
+       .clone = _cal_record_instance_utime_clone,
+       .get_str = _cal_record_instance_utime_get_str,
+       .get_str_p = _cal_record_instance_utime_get_str_p,
+       .get_int = _cal_record_instance_utime_get_int,
+       .get_double = _cal_record_instance_utime_get_double,
+       .get_lli = _cal_record_instance_utime_get_lli,
+       .get_caltime = _cal_record_instance_utime_get_caltime,
+       .set_str = _cal_record_instance_utime_set_str,
+       .set_int = _cal_record_instance_utime_set_int,
+       .set_double = _cal_record_instance_utime_set_double,
+       .set_lli = NULL,
+       .set_caltime = _cal_record_instance_utime_set_caltime,
+       .add_child_record = NULL,
+       .remove_child_record = NULL,
+       .get_child_record_count = NULL,
+       .get_child_record_at_p = NULL,
+       .clone_child_record_list = NULL
+};
+
+static void _cal_record_instance_utime_struct_init(cal_instance_utime_s* record)
+{
+       memset(record, 0, sizeof(cal_instance_utime_s));
+
+       record->event_status = CALENDAR_EVENT_STATUS_NONE;
+       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
+       record->event_id = CAL_INVALID_ID;
+
+       record->busy_status = 2;
+       record->summary = NULL;
+       record->description = NULL;
+       record->location = NULL;
+
+       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+
+       return ;
+}
+
+static int _cal_record_instance_utime_create(calendar_record_h* out_record)
+{
+       cal_instance_utime_s *temp = NULL;
+       int ret = CALENDAR_ERROR_NONE;
+
+       temp = calloc(1, sizeof(cal_instance_utime_s));
+       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       _cal_record_instance_utime_struct_init(temp);
+
+       *out_record = (calendar_record_h)temp;
+
+       return ret;
+}
+
+static void _cal_record_instance_utime_struct_free(cal_instance_utime_s *record)
+{
+       CAL_FREE(record->summary);
+       CAL_FREE(record->description);
+       CAL_FREE(record->location);
+       CAL_FREE(record->sync_data1);
+
+       CAL_FREE(record);
+}
+
+static int _cal_record_instance_utime_destroy(calendar_record_h record, bool delete_child)
+{
+       cal_instance_utime_s *temp = (cal_instance_utime_s*)(record);
+
+       _cal_record_instance_utime_struct_free(temp);
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_clone(calendar_record_h record, calendar_record_h* out_record)
+{
+       cal_instance_utime_s *out_data = NULL;
+       cal_instance_utime_s *src_data = NULL;
+
+       src_data = (cal_instance_utime_s*)(record);
+
+       out_data = calloc(1, sizeof(cal_instance_utime_s));
+       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
+
+       out_data->event_id = src_data->event_id;
+       out_data->calendar_id = src_data->calendar_id;
+       out_data->start = src_data->start;
+       out_data->end = src_data->end;
+       out_data->summary = cal_strdup(src_data->summary);
+       out_data->description = cal_strdup(src_data->description);
+       out_data->location = cal_strdup(src_data->location);
+       out_data->busy_status = src_data->busy_status;
+       out_data->event_status = src_data->event_status;
+       out_data->priority = src_data->priority;
+       out_data->sensitivity = src_data->sensitivity;
+       out_data->has_rrule = src_data->has_rrule;
+       out_data->latitude = src_data->latitude;
+       out_data->longitude = src_data->longitude;
+       out_data->has_alarm = src_data->has_alarm;
+       out_data->original_event_id = src_data->original_event_id;
+       out_data->last_mod = src_data->last_mod;
+       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
+
+       *out_record = (calendar_record_h)out_data;
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_SUMMARY:
+               *out_str = cal_strdup(rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION:
+               *out_str = cal_strdup(rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_LOCATION:
+               *out_str = cal_strdup(rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1:
+               *out_str = cal_strdup(rec->sync_data1);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_SUMMARY:
+               *out_str = (rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION:
+               *out_str = (rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_LOCATION:
+               *out_str = (rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1:
+               *out_str = (rec->sync_data1);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EVENT_ID:
+               *out_value = (rec->event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_BOOK_ID:
+               *out_value = (rec->calendar_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_BUSY_STATUS:
+               *out_value = (rec->busy_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EVENT_STATUS:
+               *out_value = (rec->event_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_PRIORITY:
+               *out_value = (rec->priority);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_SENSITIVITY:
+               *out_value = (rec->sensitivity);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_HAS_RRULE:
+               *out_value = (rec->has_rrule);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_HAS_ALARM:
+               *out_value = (rec->has_alarm);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_ORIGINAL_EVENT_ID:
+               *out_value = (rec->original_event_id);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_LATITUDE:
+               *out_value = (rec->latitude);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_LONGITUDE:
+               *out_value = (rec->longitude);
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_LAST_MODIFIED_TIME:
+               *out_value = (rec->last_mod);
+               break;
+       default:
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_START:
+               *out_value = rec->start;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_END:
+               *out_value = rec->end;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_set_str(calendar_record_h record, unsigned int property_id, const char* value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_SUMMARY:
+               CAL_FREE(rec->summary);
+               rec->summary = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION:
+               CAL_FREE(rec->description);
+               rec->description = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_LOCATION:
+               CAL_FREE(rec->location);
+               rec->location = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1:
+               CAL_FREE(rec->sync_data1);
+               rec->sync_data1 = cal_strdup(value);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_set_int(calendar_record_h record, unsigned int property_id, int value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EVENT_ID:
+               (rec->event_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_BOOK_ID:
+               (rec->calendar_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_BUSY_STATUS:
+               (rec->busy_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EVENT_STATUS:
+               (rec->event_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_PRIORITY:
+               (rec->priority) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_SENSITIVITY:
+               (rec->sensitivity) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_HAS_RRULE:
+               (rec->has_rrule) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_HAS_ALARM:
+               (rec->has_alarm) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_ORIGINAL_EVENT_ID:
+               (rec->original_event_id) = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_set_double(calendar_record_h record, unsigned int property_id, double value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_LATITUDE:
+               (rec->latitude) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_LONGITUDE:
+               (rec->longitude) = value;
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
+{
+       cal_instance_utime_s *rec = (cal_instance_utime_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_START:
+               rec->start = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_END:
+               rec->end = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
diff --git a/common/cal_record_instance_utime_extended.c b/common/cal_record_instance_utime_extended.c
new file mode 100644 (file)
index 0000000..4fc0104
--- /dev/null
@@ -0,0 +1,480 @@
+/*
+ * Calendar Service
+ *
+ * Copyright (c) 2012 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "cal_internal.h"
+#include "cal_typedef.h"
+#include "cal_view.h"
+#include "cal_record.h"
+#include "cal_utils.h"
+
+static int _cal_record_instance_utime_extended_create(calendar_record_h* out_record);
+static int _cal_record_instance_utime_extended_destroy(calendar_record_h record, bool delete_child);
+static int _cal_record_instance_utime_extended_clone(calendar_record_h record, calendar_record_h* out_record);
+static int _cal_record_instance_utime_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_utime_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str);
+static int _cal_record_instance_utime_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value);
+static int _cal_record_instance_utime_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value);
+static int _cal_record_instance_utime_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value);
+static int _cal_record_instance_utime_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value);
+static int _cal_record_instance_utime_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value);
+static int _cal_record_instance_utime_extended_set_int(calendar_record_h record, unsigned int property_id, int value);
+static int _cal_record_instance_utime_extended_set_double(calendar_record_h record, unsigned int property_id, double value);
+static int _cal_record_instance_utime_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value);
+
+cal_record_plugin_cb_s cal_record_instance_utime_extended_plugin_cb = {
+       .create = _cal_record_instance_utime_extended_create,
+       .destroy = _cal_record_instance_utime_extended_destroy,
+       .clone = _cal_record_instance_utime_extended_clone,
+       .get_str = _cal_record_instance_utime_extended_get_str,
+       .get_str_p = _cal_record_instance_utime_extended_get_str_p,
+       .get_int = _cal_record_instance_utime_extended_get_int,
+       .get_double = _cal_record_instance_utime_extended_get_double,
+       .get_lli = _cal_record_instance_utime_extended_get_lli,
+       .get_caltime = _cal_record_instance_utime_extended_get_caltime,
+       .set_str = _cal_record_instance_utime_extended_set_str,
+       .set_int = _cal_record_instance_utime_extended_set_int,
+       .set_double = _cal_record_instance_utime_extended_set_double,
+       .set_lli = NULL,
+       .set_caltime = _cal_record_instance_utime_extended_set_caltime,
+       .add_child_record = NULL,
+       .remove_child_record = NULL,
+       .get_child_record_count = NULL,
+       .get_child_record_at_p = NULL,
+       .clone_child_record_list = NULL
+};
+
+static void _cal_record_instance_utime_extended_struct_init(cal_instance_utime_extended_s* record)
+{
+       memset(record, 0, sizeof(cal_instance_utime_extended_s));
+
+       record->event_status = CALENDAR_EVENT_STATUS_NONE;
+       record->calendar_id = DEFAULT_EVENT_CALENDAR_BOOK_ID;
+       record->event_id = CAL_INVALID_ID;
+
+       record->busy_status = 2;
+       record->summary = NULL;
+       record->description = NULL;
+       record->location = NULL;
+
+       record->latitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+       record->longitude = 1000; /* set default 1000 out of range(-180 ~ 180) */
+
+       return ;
+}
+
+static int _cal_record_instance_utime_extended_create(calendar_record_h* out_record)
+{
+       cal_instance_utime_extended_s *temp = NULL;
+       int ret = CALENDAR_ERROR_NONE;
+
+       temp = calloc(1, sizeof(cal_instance_utime_extended_s));
+       RETVM_IF(NULL == temp, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       _cal_record_instance_utime_extended_struct_init(temp);
+
+       *out_record = (calendar_record_h)temp;
+
+       return ret;
+}
+
+static void _cal_record_instance_utime_extended_struct_free(cal_instance_utime_extended_s *record)
+{
+       CAL_FREE(record->summary);
+       CAL_FREE(record->description);
+       CAL_FREE(record->location);
+       CAL_FREE(record->organizer_name);
+       CAL_FREE(record->categories);
+       CAL_FREE(record->sync_data1);
+       CAL_FREE(record->sync_data2);
+       CAL_FREE(record->sync_data3);
+       CAL_FREE(record->sync_data4);
+
+       CAL_FREE(record);
+}
+
+static int _cal_record_instance_utime_extended_destroy(calendar_record_h record, bool delete_child)
+{
+       cal_instance_utime_extended_s *temp = (cal_instance_utime_extended_s*)(record);
+
+       _cal_record_instance_utime_extended_struct_free(temp);
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_clone(calendar_record_h record, calendar_record_h* out_record)
+{
+       cal_instance_utime_extended_s *out_data = NULL;
+       cal_instance_utime_extended_s *src_data = NULL;
+
+       src_data = (cal_instance_utime_extended_s*)(record);
+
+       out_data = calloc(1, sizeof(cal_instance_utime_extended_s));
+       RETVM_IF(NULL == out_data, CALENDAR_ERROR_OUT_OF_MEMORY, "calloc() Fail");
+
+       CAL_RECORD_COPY_COMMON(&(out_data->common), &(src_data->common));
+
+       out_data->event_id = src_data->event_id;
+       out_data->calendar_id = src_data->calendar_id;
+       out_data->start = src_data->start;
+       out_data->end = src_data->end;
+       out_data->summary = cal_strdup(src_data->summary);
+       out_data->description = cal_strdup(src_data->description);
+       out_data->location = cal_strdup(src_data->location);
+       out_data->busy_status = src_data->busy_status;
+       out_data->event_status = src_data->event_status;
+       out_data->priority = src_data->priority;
+       out_data->sensitivity = src_data->sensitivity;
+       out_data->has_rrule = src_data->has_rrule;
+       out_data->latitude = src_data->latitude;
+       out_data->longitude = src_data->longitude;
+       out_data->has_alarm = src_data->has_alarm;
+       out_data->original_event_id = src_data->original_event_id;
+       out_data->last_mod = src_data->last_mod;
+       out_data->organizer_name = cal_strdup(src_data->organizer_name);
+       out_data->categories = cal_strdup(src_data->categories);
+       out_data->sync_data1 = cal_strdup(src_data->sync_data1);
+       out_data->sync_data2 = cal_strdup(src_data->sync_data2);
+       out_data->sync_data3 = cal_strdup(src_data->sync_data3);
+       out_data->sync_data4 = cal_strdup(src_data->sync_data4);
+
+       *out_record = (calendar_record_h)out_data;
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_get_str(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY:
+               *out_str = cal_strdup(rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION:
+               *out_str = cal_strdup(rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION:
+               *out_str = cal_strdup(rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1:
+               *out_str = cal_strdup(rec->sync_data1);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME:
+               *out_str = cal_strdup(rec->organizer_name);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES:
+               *out_str = cal_strdup(rec->categories);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2:
+               *out_str = cal_strdup(rec->sync_data2);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3:
+               *out_str = cal_strdup(rec->sync_data3);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4:
+               *out_str = cal_strdup(rec->sync_data4);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_get_str_p(calendar_record_h record, unsigned int property_id, char** out_str)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY:
+               *out_str = (rec->summary);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION:
+               *out_str = (rec->description);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION:
+               *out_str = (rec->location);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1:
+               *out_str = (rec->sync_data1);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME:
+               *out_str = (rec->organizer_name);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES:
+               *out_str = (rec->categories);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2:
+               *out_str = (rec->sync_data2);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3:
+               *out_str = (rec->sync_data3);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4:
+               *out_str = (rec->sync_data4);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_get_int(calendar_record_h record, unsigned int property_id, int* out_value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_ID:
+               *out_value = (rec->event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BOOK_ID:
+               *out_value = (rec->calendar_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BUSY_STATUS:
+               *out_value = (rec->busy_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_STATUS:
+               *out_value = (rec->event_status);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_PRIORITY:
+               *out_value = (rec->priority);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SENSITIVITY:
+               *out_value = (rec->sensitivity);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_RRULE:
+               *out_value = (rec->has_rrule);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ALARM:
+               *out_value = (rec->has_alarm);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORIGINAL_EVENT_ID:
+               *out_value = (rec->original_event_id);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ATTENDEE:
+               *out_value = (rec->has_attendee);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_get_double(calendar_record_h record, unsigned int property_id, double* out_value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LATITUDE:
+               *out_value = (rec->latitude);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LONGITUDE:
+               *out_value = (rec->longitude);
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_get_lli(calendar_record_h record, unsigned int property_id, long long int* out_value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LAST_MODIFIED_TIME:
+               *out_value = (rec->last_mod);
+               break;
+       default:
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_get_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s* out_value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_START:
+               *out_value = rec->start;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_END:
+               *out_value = rec->end;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_set_str(calendar_record_h record, unsigned int property_id, const char* value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY:
+               CAL_FREE(rec->summary);
+               rec->summary = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION:
+               CAL_FREE(rec->description);
+               rec->description = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION:
+               CAL_FREE(rec->location);
+               rec->location = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1:
+               CAL_FREE(rec->sync_data1);
+               rec->sync_data1 = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME:
+               CAL_FREE(rec->organizer_name);
+               rec->organizer_name = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES:
+               CAL_FREE(rec->categories);
+               rec->categories = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2:
+               CAL_FREE(rec->sync_data2);
+               rec->sync_data2 = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3:
+               CAL_FREE(rec->sync_data3);
+               rec->sync_data3 = cal_strdup(value);
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4:
+               CAL_FREE(rec->sync_data4);
+               rec->sync_data4 = cal_strdup(value);
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_set_int(calendar_record_h record, unsigned int property_id, int value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_ID:
+               (rec->event_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BOOK_ID:
+               (rec->calendar_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BUSY_STATUS:
+               (rec->busy_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_STATUS:
+               (rec->event_status) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_PRIORITY:
+               (rec->priority) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SENSITIVITY:
+               (rec->sensitivity) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_RRULE:
+               (rec->has_rrule) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ALARM:
+               (rec->has_alarm) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORIGINAL_EVENT_ID:
+               (rec->original_event_id) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ATTENDEE:
+               (rec->has_attendee) = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_set_double(calendar_record_h record, unsigned int property_id, double value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LATITUDE:
+               (rec->latitude) = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LONGITUDE:
+               (rec->longitude) = value;
+               break;
+
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
+
+static int _cal_record_instance_utime_extended_set_caltime(calendar_record_h record, unsigned int property_id, calendar_time_s value)
+{
+       cal_instance_utime_extended_s *rec = (cal_instance_utime_extended_s*)(record);
+       switch (property_id) {
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_START:
+               rec->start = value;
+               break;
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_END:
+               rec->end = value;
+               break;
+       default:
+               /* LCOV_EXCL_START */
+               ERR("invalid parameter (property:0x%x)", property_id);
+               return CALENDAR_ERROR_INVALID_PARAMETER;
+               /* LCOV_EXCL_STOP */
+       }
+
+       return CALENDAR_ERROR_NONE;
+}
index cabdd06..23e2442 100644 (file)
@@ -403,7 +403,7 @@ static int _cal_record_todo_get_int(calendar_record_h record, unsigned int prope
        case CAL_PROPERTY_TODO_ID:
                *out_value = (rec->index);
                break;
-       case CAL_PROPERTY_TODO_CALENDAR_ID:
+       case CAL_PROPERTY_TODO_BOOK_ID:
                *out_value = (rec->calendar_id);
                break;
        case CAL_PROPERTY_TODO_TODO_STATUS:
@@ -630,7 +630,7 @@ static int _cal_record_todo_set_int(calendar_record_h record, unsigned int prope
        case CAL_PROPERTY_TODO_ID:
                (rec->index) = value;
                break;
-       case CAL_PROPERTY_TODO_CALENDAR_ID:
+       case CAL_PROPERTY_TODO_BOOK_ID:
                (rec->calendar_id) = value;
                break;
        case CAL_PROPERTY_TODO_TODO_STATUS:
index 7ea15d1..b31bab2 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_TIME_H__
-#define __CALENDAR_SVC_TIME_H__
+#ifndef __CALENDAR_SERVICE_TIME_H__
+#define __CALENDAR_SERVICE_TIME_H__
 
 #include <string.h>
 #include <stdlib.h>
@@ -61,4 +61,4 @@ enum cal_extract_field {
 }
 #endif
 
-#endif /* __CALENDAR_SVC_TIME_H__ */
+#endif /* __CALENDAR_SERVICE_TIME_H__ */
index cc10a23..7b99fc7 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_TYPEDEF_H__
-#define __CALENDAR_SVC_TYPEDEF_H__
+#ifndef __CALENDAR_SERVICE_TYPEDEF_H__
+#define __CALENDAR_SERVICE_TYPEDEF_H__
 
 #include <glib.h>
 #include <complex.h>
@@ -35,9 +35,9 @@
 
 #define CAL_TZID_GMT "Etc/GMT"
 #define CAL_SOCK_PATH "/run/user/%d"
-#define CAL_NOTI_EVENT_CHANGED tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_EVENT_CHANGED")
-#define CAL_NOTI_TODO_CHANGED tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_TODO_CHANGED")
-#define CAL_NOTI_CALENDAR_CHANGED tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_CALENDAR_CHANGED")
+#define CAL_NOTI_FILE_EVENT tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_EVENT_CHANGED")
+#define CAL_NOTI_FILE_TODO tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_TODO_CHANGED")
+#define CAL_NOTI_FILE_BOOK tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_CALENDAR_CHANGED")
 #define CAL_NOTI_REMINDER_CAHNGED "reminder"
 #define CAL_FORMAT_LOCAL_DATETIME "%04d-%02d-%02dT%02d:%02d:%02d"
 #define CAL_DATETIME_FORMAT_YYYYMMDD "%04d%02d%02d"
@@ -332,7 +332,7 @@ typedef struct {
        int original_event_id;
        long long int last_mod;
        char *sync_data1;
-} cal_instance_normal_s;
+} cal_instance_utime_s;
 
 typedef struct {
        cal_record_s common;
@@ -355,7 +355,7 @@ typedef struct {
        long long int last_mod;
        char *sync_data1;
        int is_allday;
-} cal_instance_allday_s;
+} cal_instance_localtime_s;
 
 typedef struct {
        cal_record_s common;
@@ -383,7 +383,7 @@ typedef struct {
        char *sync_data2;
        char *sync_data3;
        char *sync_data4;
-} cal_instance_normal_extended_s;
+} cal_instance_utime_extended_s;
 
 typedef struct {
        cal_record_s common;
@@ -412,7 +412,7 @@ typedef struct {
        char *sync_data3;
        char *sync_data4;
        int is_allday;
-} cal_instance_allday_extended_s;
+} cal_instance_localtime_extended_s;
 
 typedef struct {
        cal_record_s common;
@@ -425,7 +425,7 @@ typedef struct {
 typedef enum {
        CAL_NOTI_TYPE_EVENT = 0x0,
        CAL_NOTI_TYPE_TODO,
-       CAL_NOTI_TYPE_CALENDAR,
+       CAL_NOTI_TYPE_BOOK,
 } cal_noti_type_e;
 
 typedef struct {
@@ -509,4 +509,4 @@ typedef struct {
  * @}
  */
 
-#endif /* __CALENDAR_SVC_TYPEDEF_H__ */
+#endif /* __CALENDAR_SERVICE_TYPEDEF_H__ */
index f50a3a6..470aaeb 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_VCALENDAR_H__
-#define __CALENDAR_SVC_VCALENDAR_H__
+#ifndef __CALENDAR_SERVICE_VCALENDAR_H__
+#define __CALENDAR_SERVICE_VCALENDAR_H__
 
 #define _RECORD(i) _calendar_##i
 
@@ -27,4 +27,4 @@ enum {
        VCALENDAR_TYPE_VTODO,
 };
 
-#endif /* __CALENDAR_SVC_VCALENDAR_H__ */
+#endif /* __CALENDAR_SERVICE_VCALENDAR_H__ */
index 0c3c249..985dde4 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_VCALENDAR_MAKE_H__
-#define __CALENDAR_SVC_VCALENDAR_MAKE_H__
+#ifndef __CALENDAR_SERVICE_VCALENDAR_MAKE_H__
+#define __CALENDAR_SERVICE_VCALENDAR_MAKE_H__
 
 #include "calendar_vcalendar.h"
 
@@ -36,4 +36,4 @@ int cal_vcalendar_make_vcalendar(cal_make_s *b, calendar_list_h list);
 char* cal_vcalendar_make_get_data(cal_make_s *b);
 void cal_vcalendar_make_free(cal_make_s **b);
 
-#endif /* __CALENDAR_SVC_VCALENDAR_MAKE_H__ */
+#endif /* __CALENDAR_SERVICE_VCALENDAR_MAKE_H__ */
index 3fa1a71..f6b6e37 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_VCALENDAR_PARSE_H__
-#define __CALENDAR_SVC_VCALENDAR_PARSE_H__
+#ifndef __CALENDAR_SERVICE_VCALENDAR_PARSE_H__
+#define __CALENDAR_SERVICE_VCALENDAR_PARSE_H__
 
 #include "calendar_vcalendar.h"
 
@@ -34,4 +34,4 @@ char* cal_vcalendar_parse_read_line(char *stream, char **line);
 char* cal_vcalendar_parse_read_key_value(char *stream, char **prop, char **cont);
 int cal_vcalendar_parse_vcalendar_object(char *vcalendar_object_stream, calendar_list_h list, vcalendar_foreach_s *foreach_data);
 
-#endif /* __CALENDAR_SVC_VCALENDAR_PARSE_H__ */
+#endif /* __CALENDAR_SERVICE_VCALENDAR_PARSE_H__ */
index 415fff5..67c91ed 100644 (file)
 #include "cal_mutex.h"
 
 API const _calendar_book_property_ids   _calendar_book = {
-       ._uri = CALENDAR_VIEW_CALENDAR,
-       .id = CAL_PROPERTY_CALENDAR_ID,
-       .uid = CAL_PROPERTY_CALENDAR_UID,
-       .name = CAL_PROPERTY_CALENDAR_NAME,
-       .description = CAL_PROPERTY_CALENDAR_DESCRIPTION,
-       .color = CAL_PROPERTY_CALENDAR_COLOR,
-       .location = CAL_PROPERTY_CALENDAR_LOCATION,
-       .visibility = CAL_PROPERTY_CALENDAR_VISIBILITY,
-       .sync_event = CAL_PROPERTY_CALENDAR_SYNC_EVENT,
-       .account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID,
-       .store_type = CAL_PROPERTY_CALENDAR_STORE_TYPE,
-       .sync_data1 = CAL_PROPERTY_CALENDAR_SYNC_DATA1,
-       .sync_data2 = CAL_PROPERTY_CALENDAR_SYNC_DATA2,
-       .sync_data3 = CAL_PROPERTY_CALENDAR_SYNC_DATA3,
-       .sync_data4 = CAL_PROPERTY_CALENDAR_SYNC_DATA4,
-       .mode = CAL_PROPERTY_CALENDAR_MODE
+       ._uri = CALENDAR_VIEW_BOOK,
+       .id = CAL_PROPERTY_BOOK_ID,
+       .uid = CAL_PROPERTY_BOOK_UID,
+       .name = CAL_PROPERTY_BOOK_NAME,
+       .description = CAL_PROPERTY_BOOK_DESCRIPTION,
+       .color = CAL_PROPERTY_BOOK_COLOR,
+       .location = CAL_PROPERTY_BOOK_LOCATION,
+       .visibility = CAL_PROPERTY_BOOK_VISIBILITY,
+       .sync_event = CAL_PROPERTY_BOOK_SYNC_EVENT,
+       .account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID,
+       .store_type = CAL_PROPERTY_BOOK_STORE_TYPE,
+       .sync_data1 = CAL_PROPERTY_BOOK_SYNC_DATA1,
+       .sync_data2 = CAL_PROPERTY_BOOK_SYNC_DATA2,
+       .sync_data3 = CAL_PROPERTY_BOOK_SYNC_DATA3,
+       .sync_data4 = CAL_PROPERTY_BOOK_SYNC_DATA4,
+       .mode = CAL_PROPERTY_BOOK_MODE
 };
 
 API const _calendar_event_property_ids   _calendar_event = {
        ._uri = CALENDAR_VIEW_EVENT,
        .id = CAL_PROPERTY_EVENT_ID,
-       .calendar_book_id = CAL_PROPERTY_EVENT_CALENDAR_ID,
+       .calendar_book_id = CAL_PROPERTY_EVENT_BOOK_ID,
        .summary = CAL_PROPERTY_EVENT_SUMMARY,
        .description = CAL_PROPERTY_EVENT_DESCRIPTION,
        .location = CAL_PROPERTY_EVENT_LOCATION,
@@ -108,7 +108,7 @@ API const _calendar_event_property_ids   _calendar_event = {
 API const _calendar_todo_property_ids   _calendar_todo = {
        ._uri = CALENDAR_VIEW_TODO,
        .id = CAL_PROPERTY_TODO_ID,
-       .calendar_book_id = CAL_PROPERTY_TODO_CALENDAR_ID,
+       .calendar_book_id = CAL_PROPERTY_TODO_BOOK_ID,
        .summary = CAL_PROPERTY_TODO_SUMMARY,
        .description = CAL_PROPERTY_TODO_DESCRIPTION,
        .location = CAL_PROPERTY_TODO_LOCATION,
@@ -215,9 +215,9 @@ API const _calendar_updated_info_property_ids   _calendar_updated_info = {
 };
 
 API const _calendar_event_calendar_book_property_ids   _calendar_event_calendar_book = {
-       ._uri = CALENDAR_VIEW_EVENT_CALENDAR,
+       ._uri = CALENDAR_VIEW_EVENT_BOOK,
        .event_id = CAL_PROPERTY_EVENT_ID,
-       .calendar_book_id = CAL_PROPERTY_EVENT_CALENDAR_ID,
+       .calendar_book_id = CAL_PROPERTY_EVENT_BOOK_ID,
        .summary = CAL_PROPERTY_EVENT_SUMMARY,
        .description = CAL_PROPERTY_EVENT_DESCRIPTION,
        .location = CAL_PROPERTY_EVENT_LOCATION,
@@ -268,14 +268,14 @@ API const _calendar_event_calendar_book_property_ids   _calendar_event_calendar_
        .end_time = CAL_PROPERTY_EVENT_END,
        .end_tzid = CAL_PROPERTY_EVENT_END_TZID,
        .is_allday = CAL_PROPERTY_EVENT_IS_ALLDAY,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER
 };
 
 API const _calendar_todo_calendar_book_property_ids   _calendar_todo_calendar_book = {
-       ._uri = CALENDAR_VIEW_TODO_CALENDAR,
+       ._uri = CALENDAR_VIEW_TODO_BOOK,
        .todo_id = CAL_PROPERTY_TODO_ID,
-       .calendar_book_id = CAL_PROPERTY_TODO_CALENDAR_ID,
+       .calendar_book_id = CAL_PROPERTY_TODO_BOOK_ID,
        .summary = CAL_PROPERTY_TODO_SUMMARY,
        .description = CAL_PROPERTY_TODO_DESCRIPTION,
        .location = CAL_PROPERTY_TODO_LOCATION,
@@ -318,14 +318,14 @@ API const _calendar_todo_calendar_book_property_ids   _calendar_todo_calendar_bo
        .organizer_email = CAL_PROPERTY_TODO_ORGANIZER_EMAIL,
        .has_attendee = CAL_PROPERTY_TODO_HAS_ATTENDEE,
        .is_allday = CAL_PROPERTY_TODO_IS_ALLDAY,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER
 };
 
 API const _calendar_event_calendar_book_attendee_property_ids   _calendar_event_calendar_book_attendee = {
-       ._uri = CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE,
+       ._uri = CALENDAR_VIEW_EVENT_BOOK_ATTENDEE,
        .event_id = CAL_PROPERTY_EVENT_ID,
-       .calendar_book_id = CAL_PROPERTY_EVENT_CALENDAR_ID,
+       .calendar_book_id = CAL_PROPERTY_EVENT_BOOK_ID,
        .summary = CAL_PROPERTY_EVENT_SUMMARY,
        .description = CAL_PROPERTY_EVENT_DESCRIPTION,
        .location = CAL_PROPERTY_EVENT_LOCATION,
@@ -376,121 +376,121 @@ API const _calendar_event_calendar_book_attendee_property_ids   _calendar_event_
        .end_time = CAL_PROPERTY_EVENT_END,
        .end_tzid = CAL_PROPERTY_EVENT_END_TZID,
        .is_allday = CAL_PROPERTY_EVENT_IS_ALLDAY,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
        .attendee_email = CAL_PROPERTY_ATTENDEE_EMAIL | CAL_PROPERTY_FLAGS_FILTER,
        .attendee_name = CAL_PROPERTY_ATTENDEE_NAME | CAL_PROPERTY_FLAGS_FILTER,
        .attendee_member = CAL_PROPERTY_ATTENDEE_MEMBER | CAL_PROPERTY_FLAGS_FILTER
 };
 
 API const _calendar_instance_utime_calendar_book_property_ids   _calendar_instance_utime_calendar_book = {
-       ._uri = CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR,
-       .event_id = CAL_PROPERTY_INSTANCE_NORMAL_EVENT_ID,
-       .start_time = CAL_PROPERTY_INSTANCE_NORMAL_START,
-       .end_time = CAL_PROPERTY_INSTANCE_NORMAL_END,
-       .summary = CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY,
-       .location = CAL_PROPERTY_INSTANCE_NORMAL_LOCATION,
-       .calendar_book_id = CAL_PROPERTY_INSTANCE_NORMAL_CALENDAR_ID,
-       .description = CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION,
-       .busy_status = CAL_PROPERTY_INSTANCE_NORMAL_BUSY_STATUS,
-       .event_status = CAL_PROPERTY_INSTANCE_NORMAL_EVENT_STATUS,
-       .priority = CAL_PROPERTY_INSTANCE_NORMAL_PRIORITY,
-       .sensitivity = CAL_PROPERTY_INSTANCE_NORMAL_SENSITIVITY,
-       .has_rrule = CAL_PROPERTY_INSTANCE_NORMAL_HAS_RRULE,
-       .latitude = CAL_PROPERTY_INSTANCE_NORMAL_LATITUDE,
-       .longitude = CAL_PROPERTY_INSTANCE_NORMAL_LONGITUDE,
-       .has_alarm = CAL_PROPERTY_INSTANCE_NORMAL_HAS_ALARM,
-       .original_event_id = CAL_PROPERTY_INSTANCE_NORMAL_ORIGINAL_EVENT_ID,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
-       .last_modified_time = CAL_PROPERTY_INSTANCE_NORMAL_LAST_MODIFIED_TIME,
-       .sync_data1 = CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1
+       ._uri = CALENDAR_VIEW_INSTANCE_UTIME_BOOK,
+       .event_id = CAL_PROPERTY_INSTANCE_UTIME_EVENT_ID,
+       .start_time = CAL_PROPERTY_INSTANCE_UTIME_START,
+       .end_time = CAL_PROPERTY_INSTANCE_UTIME_END,
+       .summary = CAL_PROPERTY_INSTANCE_UTIME_SUMMARY,
+       .location = CAL_PROPERTY_INSTANCE_UTIME_LOCATION,
+       .calendar_book_id = CAL_PROPERTY_INSTANCE_UTIME_BOOK_ID,
+       .description = CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION,
+       .busy_status = CAL_PROPERTY_INSTANCE_UTIME_BUSY_STATUS,
+       .event_status = CAL_PROPERTY_INSTANCE_UTIME_EVENT_STATUS,
+       .priority = CAL_PROPERTY_INSTANCE_UTIME_PRIORITY,
+       .sensitivity = CAL_PROPERTY_INSTANCE_UTIME_SENSITIVITY,
+       .has_rrule = CAL_PROPERTY_INSTANCE_UTIME_HAS_RRULE,
+       .latitude = CAL_PROPERTY_INSTANCE_UTIME_LATITUDE,
+       .longitude = CAL_PROPERTY_INSTANCE_UTIME_LONGITUDE,
+       .has_alarm = CAL_PROPERTY_INSTANCE_UTIME_HAS_ALARM,
+       .original_event_id = CAL_PROPERTY_INSTANCE_UTIME_ORIGINAL_EVENT_ID,
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
+       .last_modified_time = CAL_PROPERTY_INSTANCE_UTIME_LAST_MODIFIED_TIME,
+       .sync_data1 = CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1
 };
 
 API const _calendar_instance_localtime_calendar_book_property_ids   _calendar_instance_localtime_calendar_book = {
-       ._uri = CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR,
-       .event_id = CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_ID,
-       .start_time = CAL_PROPERTY_INSTANCE_ALLDAY_START,
-       .end_time = CAL_PROPERTY_INSTANCE_ALLDAY_END,
-       .summary = CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY,
-       .location = CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION,
-       .calendar_book_id = CAL_PROPERTY_INSTANCE_ALLDAY_CALENDAR_ID,
-       .description = CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION,
-       .busy_status = CAL_PROPERTY_INSTANCE_ALLDAY_BUSY_STATUS,
-       .event_status = CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_STATUS,
-       .priority = CAL_PROPERTY_INSTANCE_ALLDAY_PRIORITY,
-       .sensitivity = CAL_PROPERTY_INSTANCE_ALLDAY_SENSITIVITY,
-       .has_rrule = CAL_PROPERTY_INSTANCE_ALLDAY_HAS_RRULE,
-       .latitude = CAL_PROPERTY_INSTANCE_ALLDAY_LATITUDE,
-       .longitude = CAL_PROPERTY_INSTANCE_ALLDAY_LONGITUDE,
-       .has_alarm = CAL_PROPERTY_INSTANCE_ALLDAY_HAS_ALARM,
-       .original_event_id = CAL_PROPERTY_INSTANCE_ALLDAY_ORIGINAL_EVENT_ID,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
-       .last_modified_time = CAL_PROPERTY_INSTANCE_ALLDAY_LAST_MODIFIED_TIME,
-       .sync_data1 = CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1,
-       .is_allday = CAL_PROPERTY_INSTANCE_ALLDAY_IS_ALLDAY
+       ._uri = CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK,
+       .event_id = CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_ID,
+       .start_time = CAL_PROPERTY_INSTANCE_LOCALTIME_START,
+       .end_time = CAL_PROPERTY_INSTANCE_LOCALTIME_END,
+       .summary = CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY,
+       .location = CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION,
+       .calendar_book_id = CAL_PROPERTY_INSTANCE_LOCALTIME_BOOK_ID,
+       .description = CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION,
+       .busy_status = CAL_PROPERTY_INSTANCE_LOCALTIME_BUSY_STATUS,
+       .event_status = CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_STATUS,
+       .priority = CAL_PROPERTY_INSTANCE_LOCALTIME_PRIORITY,
+       .sensitivity = CAL_PROPERTY_INSTANCE_LOCALTIME_SENSITIVITY,
+       .has_rrule = CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_RRULE,
+       .latitude = CAL_PROPERTY_INSTANCE_LOCALTIME_LATITUDE,
+       .longitude = CAL_PROPERTY_INSTANCE_LOCALTIME_LONGITUDE,
+       .has_alarm = CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_ALARM,
+       .original_event_id = CAL_PROPERTY_INSTANCE_LOCALTIME_ORIGINAL_EVENT_ID,
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
+       .last_modified_time = CAL_PROPERTY_INSTANCE_LOCALTIME_LAST_MODIFIED_TIME,
+       .sync_data1 = CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1,
+       .is_allday = CAL_PROPERTY_INSTANCE_LOCALTIME_IS_ALLDAY
 };
 
 API const _calendar_instance_utime_calendar_book_extended_property_ids   _calendar_instance_utime_calendar_book_extended = {
-       ._uri = CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED,
-       .event_id = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_ID,
-       .start_time = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_START,
-       .end_time = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_END,
-       .summary = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY,
-       .location = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION,
-       .calendar_book_id = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CALENDAR_ID,
-       .description = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION,
-       .busy_status = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_BUSY_STATUS,
-       .event_status = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_STATUS,
-       .priority = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_PRIORITY,
-       .sensitivity = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SENSITIVITY,
-       .has_rrule = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_RRULE,
-       .latitude = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LATITUDE,
-       .longitude = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LONGITUDE,
-       .has_alarm = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ALARM,
-       .original_event_id = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORIGINAL_EVENT_ID,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
-       .last_modified_time = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LAST_MODIFIED_TIME,
-       .sync_data1 = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1,
-       .organizer_name = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME,
-       .categories = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES,
-       .has_attendee = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ATTENDEE,
-       .sync_data2 = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2,
-       .sync_data3 = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3,
-       .sync_data4 = CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4
+       ._uri = CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED,
+       .event_id = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_ID,
+       .start_time = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_START,
+       .end_time = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_END,
+       .summary = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY,
+       .location = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION,
+       .calendar_book_id = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BOOK_ID,
+       .description = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION,
+       .busy_status = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BUSY_STATUS,
+       .event_status = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_STATUS,
+       .priority = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_PRIORITY,
+       .sensitivity = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SENSITIVITY,
+       .has_rrule = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_RRULE,
+       .latitude = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LATITUDE,
+       .longitude = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LONGITUDE,
+       .has_alarm = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ALARM,
+       .original_event_id = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORIGINAL_EVENT_ID,
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
+       .last_modified_time = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LAST_MODIFIED_TIME,
+       .sync_data1 = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1,
+       .organizer_name = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME,
+       .categories = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES,
+       .has_attendee = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ATTENDEE,
+       .sync_data2 = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2,
+       .sync_data3 = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3,
+       .sync_data4 = CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4
 };
 
 API const _calendar_instance_localtime_calendar_book_extended_property_ids   _calendar_instance_localtime_calendar_book_extended = {
-       ._uri = CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED,
-       .event_id = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_ID,
-       .start_time = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_START,
-       .end_time = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_END,
-       .summary = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY,
-       .location = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION,
-       .calendar_book_id = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CALENDAR_ID,
-       .description = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION,
-       .busy_status = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_BUSY_STATUS,
-       .event_status = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_STATUS,
-       .priority = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_PRIORITY,
-       .sensitivity = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SENSITIVITY,
-       .has_rrule = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_RRULE,
-       .latitude = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LATITUDE,
-       .longitude = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LONGITUDE,
-       .has_alarm = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ALARM,
-       .original_event_id = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORIGINAL_EVENT_ID,
-       .calendar_book_visibility = CAL_PROPERTY_CALENDAR_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
-       .calendar_book_account_id = CAL_PROPERTY_CALENDAR_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
-       .last_modified_time = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LAST_MODIFIED_TIME,
-       .sync_data1 = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1,
-       .organizer_name = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME,
-       .categories = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES,
-       .has_attendee = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ATTENDEE,
-       .sync_data2 = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2,
-       .sync_data3 = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3,
-       .sync_data4 = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4,
-       .is_allday = CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_IS_ALLDAY
+       ._uri = CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED,
+       .event_id = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_ID,
+       .start_time = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_START,
+       .end_time = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_END,
+       .summary = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY,
+       .location = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION,
+       .calendar_book_id = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BOOK_ID,
+       .description = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION,
+       .busy_status = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BUSY_STATUS,
+       .event_status = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_STATUS,
+       .priority = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_PRIORITY,
+       .sensitivity = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SENSITIVITY,
+       .has_rrule = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_RRULE,
+       .latitude = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LATITUDE,
+       .longitude = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LONGITUDE,
+       .has_alarm = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ALARM,
+       .original_event_id = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORIGINAL_EVENT_ID,
+       .calendar_book_visibility = CAL_PROPERTY_BOOK_VISIBILITY | CAL_PROPERTY_FLAGS_FILTER,
+       .calendar_book_account_id = CAL_PROPERTY_BOOK_ACCOUNT_ID | CAL_PROPERTY_FLAGS_FILTER,
+       .last_modified_time = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LAST_MODIFIED_TIME,
+       .sync_data1 = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1,
+       .organizer_name = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME,
+       .categories = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES,
+       .has_attendee = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ATTENDEE,
+       .sync_data2 = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2,
+       .sync_data3 = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3,
+       .sync_data4 = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4,
+       .is_allday = CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_IS_ALLDAY
 };
 
 API const _calendar_extended_property_property_ids   _calendar_extended_property = {
@@ -503,26 +503,26 @@ API const _calendar_extended_property_property_ids   _calendar_extended_property
 };
 
 const cal_property_info_s  __property_calendar_book[] = {
-       {CAL_PROPERTY_CALENDAR_ID           ,       "id"},
-       {CAL_PROPERTY_CALENDAR_UID          ,       "uid"},
-       {CAL_PROPERTY_CALENDAR_NAME         ,       "name"},
-       {CAL_PROPERTY_CALENDAR_DESCRIPTION  ,       "description"},
-       {CAL_PROPERTY_CALENDAR_COLOR        ,       "color"},
-       {CAL_PROPERTY_CALENDAR_LOCATION     ,       "location"},
-       {CAL_PROPERTY_CALENDAR_VISIBILITY   ,       "visibility"},
-       {CAL_PROPERTY_CALENDAR_SYNC_EVENT   ,       "sync_event"},
-       {CAL_PROPERTY_CALENDAR_ACCOUNT_ID   ,       "account_id"},
-       {CAL_PROPERTY_CALENDAR_STORE_TYPE   ,       "store_type"},
-       {CAL_PROPERTY_CALENDAR_SYNC_DATA1   ,       "sync_data1"},
-       {CAL_PROPERTY_CALENDAR_SYNC_DATA2   ,       "sync_data2"},
-       {CAL_PROPERTY_CALENDAR_SYNC_DATA3   ,       "sync_data3"},
-       {CAL_PROPERTY_CALENDAR_SYNC_DATA4   ,       "sync_data4"},
-       {CAL_PROPERTY_CALENDAR_MODE,                "mode"},
+       {CAL_PROPERTY_BOOK_ID           ,       "id"},
+       {CAL_PROPERTY_BOOK_UID          ,       "uid"},
+       {CAL_PROPERTY_BOOK_NAME         ,       "name"},
+       {CAL_PROPERTY_BOOK_DESCRIPTION  ,       "description"},
+       {CAL_PROPERTY_BOOK_COLOR        ,       "color"},
+       {CAL_PROPERTY_BOOK_LOCATION     ,       "location"},
+       {CAL_PROPERTY_BOOK_VISIBILITY   ,       "visibility"},
+       {CAL_PROPERTY_BOOK_SYNC_EVENT   ,       "sync_event"},
+       {CAL_PROPERTY_BOOK_ACCOUNT_ID   ,       "account_id"},
+       {CAL_PROPERTY_BOOK_STORE_TYPE   ,       "store_type"},
+       {CAL_PROPERTY_BOOK_SYNC_DATA1   ,       "sync_data1"},
+       {CAL_PROPERTY_BOOK_SYNC_DATA2   ,       "sync_data2"},
+       {CAL_PROPERTY_BOOK_SYNC_DATA3   ,       "sync_data3"},
+       {CAL_PROPERTY_BOOK_SYNC_DATA4   ,       "sync_data4"},
+       {CAL_PROPERTY_BOOK_MODE,                "mode"},
 };
 
 const cal_property_info_s   __property_event[] = {
        {CAL_PROPERTY_EVENT_ID,                     "id"},
-       {CAL_PROPERTY_EVENT_CALENDAR_ID,            "calendar_id"},
+       {CAL_PROPERTY_EVENT_BOOK_ID,            "calendar_id"},
        {CAL_PROPERTY_EVENT_SUMMARY,                "summary"},
        {CAL_PROPERTY_EVENT_DESCRIPTION,            "description"},
        {CAL_PROPERTY_EVENT_LOCATION,               "location"},
@@ -582,7 +582,7 @@ const cal_property_info_s   __property_event[] = {
 
 const cal_property_info_s   __property_todo[] = {
        {CAL_PROPERTY_TODO_ID,                      "id"},
-       {CAL_PROPERTY_TODO_CALENDAR_ID,             "calendar_id"},
+       {CAL_PROPERTY_TODO_BOOK_ID,             "calendar_id"},
        {CAL_PROPERTY_TODO_SUMMARY,                 "summary"},
        {CAL_PROPERTY_TODO_DESCRIPTION,             "description"},
        {CAL_PROPERTY_TODO_LOCATION,                "location"},
@@ -686,7 +686,7 @@ const cal_property_info_s   __property_updated_info[] = {
 
 const cal_property_info_s   __property_search_event_calendar[] = {
        {CAL_PROPERTY_EVENT_ID,                     "id"},
-       {CAL_PROPERTY_EVENT_CALENDAR_ID,            "calendar_id"},
+       {CAL_PROPERTY_EVENT_BOOK_ID,            "calendar_id"},
        {CAL_PROPERTY_EVENT_SUMMARY,                "summary"},
        {CAL_PROPERTY_EVENT_DESCRIPTION,            "description"},
        {CAL_PROPERTY_EVENT_LOCATION,               "location"},
@@ -737,13 +737,13 @@ const cal_property_info_s   __property_search_event_calendar[] = {
        {CAL_PROPERTY_EVENT_START_TZID,             "dtstart_tzid"},
        {CAL_PROPERTY_EVENT_END_TZID,               "dtend_tzid"},
        {CAL_PROPERTY_EVENT_IS_ALLDAY,              "is_allday"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
 };
 
 const cal_property_info_s   __property_search_todo_calendar[] = {
        {CAL_PROPERTY_TODO_ID,                      "id"},
-       {CAL_PROPERTY_TODO_CALENDAR_ID,             "calendar_id"},
+       {CAL_PROPERTY_TODO_BOOK_ID,             "calendar_id"},
        {CAL_PROPERTY_TODO_SUMMARY,                 "summary"},
        {CAL_PROPERTY_TODO_DESCRIPTION,             "description"},
        {CAL_PROPERTY_TODO_LOCATION,                "location"},
@@ -786,13 +786,13 @@ const cal_property_info_s   __property_search_todo_calendar[] = {
        {CAL_PROPERTY_TODO_ORGANIZER_EMAIL,         "organizer_email"},
        {CAL_PROPERTY_TODO_HAS_ATTENDEE,            "has_attendee"},
        {CAL_PROPERTY_TODO_IS_ALLDAY,               "dtend_type"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
 };
 
 const cal_property_info_s   __property_search_event_calendar_attendee[] = {
        {CAL_PROPERTY_EVENT_ID,                     "id"},
-       {CAL_PROPERTY_EVENT_CALENDAR_ID,            "calendar_id"},
+       {CAL_PROPERTY_EVENT_BOOK_ID,            "calendar_id"},
        {CAL_PROPERTY_EVENT_SUMMARY,                "summary"},
        {CAL_PROPERTY_EVENT_DESCRIPTION,            "description"},
        {CAL_PROPERTY_EVENT_LOCATION,               "location"},
@@ -843,118 +843,118 @@ const cal_property_info_s   __property_search_event_calendar_attendee[] = {
        {CAL_PROPERTY_EVENT_START_TZID,             "dtstart_tzid"},
        {CAL_PROPERTY_EVENT_END_TZID,               "dtend_tzid"},
        {CAL_PROPERTY_EVENT_IS_ALLDAY,              "is_allday"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
        {(CAL_PROPERTY_ATTENDEE_EMAIL|CAL_PROPERTY_FLAGS_FILTER),            "attendee_email"},
        {(CAL_PROPERTY_ATTENDEE_NAME|CAL_PROPERTY_FLAGS_FILTER),             "attendee_name"},
        {(CAL_PROPERTY_ATTENDEE_MEMBER|CAL_PROPERTY_FLAGS_FILTER),           "attendee_member"},
 };
 
 const cal_property_info_s   __property_search_instance_utime_calendar[] = {
-       {CAL_PROPERTY_INSTANCE_NORMAL_EVENT_ID,             "event_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_END,                  "dtend_type,dtend_utime,dtend_datetime"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY,              "summary"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_LOCATION,             "location"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_CALENDAR_ID,          "calendar_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION,          "description"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_BUSY_STATUS,          "busy_status"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EVENT_STATUS,         "task_status"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_PRIORITY,             "priority"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_SENSITIVITY,          "sensitivity"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_HAS_RRULE,             "rrule_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_LATITUDE,             "latitude"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_LONGITUDE,            "longitude"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_HAS_ALARM,            "has_alarm"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_ORIGINAL_EVENT_ID,    "original_event_id"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_LAST_MODIFIED_TIME,   "last_mod"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1,   "sync_data1"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EVENT_ID,             "event_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
+       {CAL_PROPERTY_INSTANCE_UTIME_END,                  "dtend_type,dtend_utime,dtend_datetime"},
+       {CAL_PROPERTY_INSTANCE_UTIME_SUMMARY,              "summary"},
+       {CAL_PROPERTY_INSTANCE_UTIME_LOCATION,             "location"},
+       {CAL_PROPERTY_INSTANCE_UTIME_BOOK_ID,          "calendar_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION,          "description"},
+       {CAL_PROPERTY_INSTANCE_UTIME_BUSY_STATUS,          "busy_status"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EVENT_STATUS,         "task_status"},
+       {CAL_PROPERTY_INSTANCE_UTIME_PRIORITY,             "priority"},
+       {CAL_PROPERTY_INSTANCE_UTIME_SENSITIVITY,          "sensitivity"},
+       {CAL_PROPERTY_INSTANCE_UTIME_HAS_RRULE,             "rrule_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_LATITUDE,             "latitude"},
+       {CAL_PROPERTY_INSTANCE_UTIME_LONGITUDE,            "longitude"},
+       {CAL_PROPERTY_INSTANCE_UTIME_HAS_ALARM,            "has_alarm"},
+       {CAL_PROPERTY_INSTANCE_UTIME_ORIGINAL_EVENT_ID,    "original_event_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_LAST_MODIFIED_TIME,   "last_mod"},
+       {CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1,   "sync_data1"},
 };
 
 const cal_property_info_s   __property_search_instance_localtime_calendar[] = {
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_ID,             "event_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_END,                  "dtend_type,dtend_utime,dtend_datetime"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY,              "summary"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION,             "location"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_CALENDAR_ID,          "calendar_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION,          "description"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_BUSY_STATUS,          "busy_status"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_STATUS,         "task_status"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_PRIORITY,             "priority"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_SENSITIVITY,          "sensitivity"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_HAS_RRULE,             "rrule_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_LATITUDE,             "latitude"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_LONGITUDE,            "longitude"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_HAS_ALARM,            "has_alarm"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_ORIGINAL_EVENT_ID,    "original_event_id"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_LAST_MODIFIED_TIME,   "last_mod"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1,   "sync_data1"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_IS_ALLDAY,   "is_allday"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_ID,             "event_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_END,                  "dtend_type,dtend_utime,dtend_datetime"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY,              "summary"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION,             "location"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_BOOK_ID,          "calendar_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION,          "description"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_BUSY_STATUS,          "busy_status"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_STATUS,         "task_status"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_PRIORITY,             "priority"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_SENSITIVITY,          "sensitivity"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_RRULE,             "rrule_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_LATITUDE,             "latitude"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_LONGITUDE,            "longitude"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_ALARM,            "has_alarm"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_ORIGINAL_EVENT_ID,    "original_event_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_LAST_MODIFIED_TIME,   "last_mod"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1,   "sync_data1"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_IS_ALLDAY,   "is_allday"},
 };
 
 const cal_property_info_s   __property_search_instance_utime_calendar_extended[] = {
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_ID,             "event_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_END,                  "dtend_type,dtend_utime,dtend_datetime"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY,              "summary"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION,             "location"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CALENDAR_ID,          "calendar_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION,          "description"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_BUSY_STATUS,          "busy_status"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_STATUS,         "task_status"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_PRIORITY,             "priority"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SENSITIVITY,          "sensitivity"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_RRULE,            "rrule_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LATITUDE,             "latitude"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LONGITUDE,            "longitude"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ALARM,            "has_alarm"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORIGINAL_EVENT_ID,    "original_event_id"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LAST_MODIFIED_TIME,   "last_mod"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1,   "sync_data1"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME,   "organizer_name"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES,   "categories"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ATTENDEE,   "has_attendee"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2,   "sync_data2"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3,   "sync_data3"},
-       {CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4,   "sync_data4"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_ID,             "event_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_END,                  "dtend_type,dtend_utime,dtend_datetime"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY,              "summary"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION,             "location"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BOOK_ID,          "calendar_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION,          "description"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BUSY_STATUS,          "busy_status"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_STATUS,         "task_status"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_PRIORITY,             "priority"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SENSITIVITY,          "sensitivity"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_RRULE,            "rrule_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LATITUDE,             "latitude"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LONGITUDE,            "longitude"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ALARM,            "has_alarm"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORIGINAL_EVENT_ID,    "original_event_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LAST_MODIFIED_TIME,   "last_mod"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1,   "sync_data1"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME,   "organizer_name"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES,   "categories"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ATTENDEE,   "has_attendee"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2,   "sync_data2"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3,   "sync_data3"},
+       {CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4,   "sync_data4"},
 };
 
 
 const cal_property_info_s   __property_search_instance_localtime_calendar_extended[] = {
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_ID,             "event_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_END,                  "dtend_type,dtend_utime,dtend_datetime"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY,              "summary"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION,             "location"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CALENDAR_ID,          "calendar_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION,          "description"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_BUSY_STATUS,          "busy_status"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_STATUS,         "task_status"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_PRIORITY,             "priority"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SENSITIVITY,          "sensitivity"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_RRULE,            "rrule_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LATITUDE,             "latitude"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LONGITUDE,            "longitude"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ALARM,            "has_alarm"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORIGINAL_EVENT_ID,    "original_event_id"},
-       {(CAL_PROPERTY_CALENDAR_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
-       {(CAL_PROPERTY_CALENDAR_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LAST_MODIFIED_TIME,   "last_mod"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1,   "sync_data1"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME,   "organizer_name"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES,   "categories"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ATTENDEE,   "has_attendee"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2,   "sync_data2"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3,   "sync_data3"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4,   "sync_data4"},
-       {CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_IS_ALLDAY,    "is_allday"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_ID,             "event_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_START,                "dtstart_type,dtstart_utime,dtstart_datetime"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_END,                  "dtend_type,dtend_utime,dtend_datetime"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY,              "summary"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION,             "location"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BOOK_ID,          "calendar_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION,          "description"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BUSY_STATUS,          "busy_status"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_STATUS,         "task_status"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_PRIORITY,             "priority"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SENSITIVITY,          "sensitivity"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_RRULE,            "rrule_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LATITUDE,             "latitude"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LONGITUDE,            "longitude"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ALARM,            "has_alarm"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORIGINAL_EVENT_ID,    "original_event_id"},
+       {(CAL_PROPERTY_BOOK_VISIBILITY|CAL_PROPERTY_FLAGS_FILTER),       "visibility"},
+       {(CAL_PROPERTY_BOOK_ACCOUNT_ID|CAL_PROPERTY_FLAGS_FILTER),       "account_id"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LAST_MODIFIED_TIME,   "last_mod"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1,   "sync_data1"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME,   "organizer_name"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES,   "categories"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ATTENDEE,   "has_attendee"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2,   "sync_data2"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3,   "sync_data3"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4,   "sync_data4"},
+       {CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_IS_ALLDAY,    "is_allday"},
 };
 
 const cal_property_info_s   __property_extended[] = {
@@ -976,20 +976,20 @@ typedef struct {
 
 
 static const cal_view_uri_info_s __tables[] = {
-       {CALENDAR_VIEW_CALENDAR,        CAL_RECORD_TYPE_CALENDAR,           PTR_COUNT(__property_calendar_book) },
+       {CALENDAR_VIEW_BOOK,        CAL_RECORD_TYPE_BOOK,           PTR_COUNT(__property_calendar_book) },
        {CALENDAR_VIEW_EVENT,           CAL_RECORD_TYPE_EVENT,              PTR_COUNT(__property_event) },
        {CALENDAR_VIEW_TODO,            CAL_RECORD_TYPE_TODO,               PTR_COUNT(__property_todo) },
        {CALENDAR_VIEW_TIMEZONE,        CAL_RECORD_TYPE_TIMEZONE,           PTR_COUNT(__property_timezone) },
        {CALENDAR_VIEW_ATTENDEE,        CAL_RECORD_TYPE_ATTENDEE,           PTR_COUNT(__property_attendee) },
        {CALENDAR_VIEW_ALARM,           CAL_RECORD_TYPE_ALARM,              PTR_COUNT(__property_alarm) },
        {CALENDAR_VIEW_UPDATED_INFO,    CAL_RECORD_TYPE_UPDATED_INFO,       PTR_COUNT(__property_updated_info) },
-       {CALENDAR_VIEW_EVENT_CALENDAR,  CAL_RECORD_TYPE_SEARCH,             PTR_COUNT(__property_search_event_calendar) },
-       {CALENDAR_VIEW_TODO_CALENDAR,   CAL_RECORD_TYPE_SEARCH,             PTR_COUNT(__property_search_todo_calendar) },
-       {CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE,  CAL_RECORD_TYPE_SEARCH,    PTR_COUNT(__property_search_event_calendar_attendee) },
-       {CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR, CAL_RECORD_TYPE_INSTANCE_NORMAL, PTR_COUNT(__property_search_instance_utime_calendar) },
-       {CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR, CAL_RECORD_TYPE_INSTANCE_ALLDAY, PTR_COUNT(__property_search_instance_localtime_calendar) },
-       {CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED, CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED, PTR_COUNT(__property_search_instance_utime_calendar_extended) },
-       {CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED, CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED, PTR_COUNT(__property_search_instance_localtime_calendar_extended) },
+       {CALENDAR_VIEW_EVENT_BOOK,  CAL_RECORD_TYPE_SEARCH,             PTR_COUNT(__property_search_event_calendar) },
+       {CALENDAR_VIEW_TODO_BOOK,   CAL_RECORD_TYPE_SEARCH,             PTR_COUNT(__property_search_todo_calendar) },
+       {CALENDAR_VIEW_EVENT_BOOK_ATTENDEE,  CAL_RECORD_TYPE_SEARCH,    PTR_COUNT(__property_search_event_calendar_attendee) },
+       {CALENDAR_VIEW_INSTANCE_UTIME_BOOK, CAL_RECORD_TYPE_INSTANCE_UTIME, PTR_COUNT(__property_search_instance_utime_calendar) },
+       {CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK, CAL_RECORD_TYPE_INSTANCE_LOCALTIME, PTR_COUNT(__property_search_instance_localtime_calendar) },
+       {CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED, CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED, PTR_COUNT(__property_search_instance_utime_calendar_extended) },
+       {CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED, CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED, PTR_COUNT(__property_search_instance_localtime_calendar_extended) },
        {CALENDAR_VIEW_EXTENDED, CAL_RECORD_TYPE_EXTENDED, PTR_COUNT(__property_extended) },
 };
 
@@ -1017,20 +1017,20 @@ void cal_view_initialize(void)
        if (NULL == cal_uri_property_hash) {
                cal_uri_property_hash = g_hash_table_new(g_str_hash, g_str_equal);
                if (cal_uri_property_hash) {
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_CALENDAR, GINT_TO_POINTER(&(__tables[0])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_BOOK, GINT_TO_POINTER(&(__tables[0])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_EVENT, GINT_TO_POINTER(&(__tables[1])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_TODO, GINT_TO_POINTER(&(__tables[2])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_TIMEZONE, GINT_TO_POINTER(&(__tables[3])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_ATTENDEE, GINT_TO_POINTER(&(__tables[4])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_ALARM, GINT_TO_POINTER(&(__tables[5])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_UPDATED_INFO, GINT_TO_POINTER(&(__tables[6])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_EVENT_CALENDAR, GINT_TO_POINTER(&(__tables[7])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_TODO_CALENDAR, GINT_TO_POINTER(&(__tables[8])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE, GINT_TO_POINTER(&(__tables[9])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR, GINT_TO_POINTER(&(__tables[10])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR, GINT_TO_POINTER(&(__tables[11])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED, GINT_TO_POINTER(&(__tables[12])));
-                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED, GINT_TO_POINTER(&(__tables[13])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_EVENT_BOOK, GINT_TO_POINTER(&(__tables[7])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_TODO_BOOK, GINT_TO_POINTER(&(__tables[8])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_EVENT_BOOK_ATTENDEE, GINT_TO_POINTER(&(__tables[9])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_UTIME_BOOK, GINT_TO_POINTER(&(__tables[10])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK, GINT_TO_POINTER(&(__tables[11])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED, GINT_TO_POINTER(&(__tables[12])));
+                       g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED, GINT_TO_POINTER(&(__tables[13])));
                        g_hash_table_insert(cal_uri_property_hash, CALENDAR_VIEW_EXTENDED, GINT_TO_POINTER(&(__tables[14])));
                }
        }
index ea74aac..94be806 100644 (file)
  * limitations under the License.
  *
  */
-#ifndef __CALENDAR_SVC_VIEW_H__
-#define __CALENDAR_SVC_VIEW_H__
+#ifndef __CALENDAR_SERVICE_VIEW_H__
+#define __CALENDAR_SERVICE_VIEW_H__
 
 #include "cal_typedef.h"
 #include "calendar_view.h"
 
 /* db record view: get, get_list, insert, update, delete, filter */
-#define CALENDAR_VIEW_CALENDAR              "tizen.calendar_view.calendar"
-#define CALENDAR_VIEW_EVENT                 "tizen.calendar_view.event"
-#define CALENDAR_VIEW_TODO                  "tizen.calendar_view.todo"
-#define CALENDAR_VIEW_TIMEZONE              "tizen.calendar_view.timezone"
+#define CALENDAR_VIEW_BOOK "tizen.calendar_view.book"
+#define CALENDAR_VIEW_EVENT "tizen.calendar_view.event"
+#define CALENDAR_VIEW_TODO "tizen.calendar_view.todo"
+#define CALENDAR_VIEW_TIMEZONE "tizen.calendar_view.timezone"
 
 /* child view */
-#define CALENDAR_VIEW_ATTENDEE              "tizen.calendar_view.attendee"
-#define CALENDAR_VIEW_ALARM                 "tizen.calendar_view.alarm"
+#define CALENDAR_VIEW_ATTENDEE "tizen.calendar_view.attendee"
+#define CALENDAR_VIEW_ALARM "tizen.calendar_view.alarm"
 
 /* updated info: get_list */
-#define CALENDAR_VIEW_UPDATED_INFO          "tizen.calendar_view.updated_info"
+#define CALENDAR_VIEW_UPDATED_INFO "tizen.calendar_view.updated_info"
 
 /* extended_table */
-#define CALENDAR_VIEW_EXTENDED              "tizen.calendar_view.extended_property"
+#define CALENDAR_VIEW_EXTENDED "tizen.calendar_view.extended_property"
 
 /* only for query (filter) */
-#define CALENDAR_VIEW_EVENT_CALENDAR "tizen.calendar_view.event/calendar"
-#define CALENDAR_VIEW_TODO_CALENDAR "tizen.calendar_view.todo/calendar"
-#define CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE "tizen.calendar_view.event/calendar/attendee"
-#define CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR "tizen.calendar_view.instance_utime/calendar"
-#define CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR "tizen.calendar_view.instance_localtime/calendar"
-#define CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED "tizen.calendar_view.extended/instance_utime/calendar"
-#define CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED "tizen.calendar_view.extended/instance_localtime/calendar"
+#define CALENDAR_VIEW_EVENT_BOOK "tizen.calendar_view.event/book"
+#define CALENDAR_VIEW_TODO_BOOK "tizen.calendar_view.todo/book"
+#define CALENDAR_VIEW_EVENT_BOOK_ATTENDEE "tizen.calendar_view.event/book/attendee"
+#define CALENDAR_VIEW_INSTANCE_UTIME_BOOK "tizen.calendar_view.instance_utime/book"
+#define CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK "tizen.calendar_view.instance_localtime/book"
+#define CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED "tizen.calendar_view.extended/instance_utime/book"
+#define CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED "tizen.calendar_view.extended/instance_localtime/book"
 
-/* for type check: data_type mask               0x000FF000 */
-#define CAL_PROPERTY_DATA_TYPE_MASK             0x000FF000
-#define CAL_PROPERTY_DATA_TYPE_INT              0x00001000
-#define CAL_PROPERTY_DATA_TYPE_STR              0x00002000
-#define CAL_PROPERTY_DATA_TYPE_DOUBLE           0x00003000
-#define CAL_PROPERTY_DATA_TYPE_LLI              0x00004000
-#define CAL_PROPERTY_DATA_TYPE_CALTIME          0x00005000
-#define CAL_PROPERTY_DATA_TYPE_REC              0x00006000
+/* for type check: data_type mask                0x000FF000 */
+#define CAL_PROPERTY_DATA_TYPE_MASK              0x000FF000
+#define CAL_PROPERTY_DATA_TYPE_INT               0x00001000
+#define CAL_PROPERTY_DATA_TYPE_STR               0x00002000
+#define CAL_PROPERTY_DATA_TYPE_DOUBLE            0x00003000
+#define CAL_PROPERTY_DATA_TYPE_LLI               0x00004000
+#define CAL_PROPERTY_DATA_TYPE_CALTIME           0x00005000
+#define CAL_PROPERTY_DATA_TYPE_REC               0x00006000
 #define CAL_PROPERTY_CHECK_DATA_TYPE(property_id, data_type) \
        ((property_id&CAL_PROPERTY_DATA_TYPE_MASK) == data_type ? true : false)
 
-/* for property                                 0xFF000000 */
-#define CAL_PROPERTY_MASK                       0xFF000000
-#define CAL_PROPERTY_CALENDAR                   0x01000000
-#define CAL_PROPERTY_EVENT                      0x02000000
-#define CAL_PROPERTY_TODO                       0x03000000
-#define CAL_PROPERTY_TIMEZONE                   0x04000000
-#define CAL_PROPERTY_ATTENDEE                   0x05000000
-#define CAL_PROPERTY_ALARM                      0x06000000
-#define CAL_PROPERTY_INSTANCE_NORMAL            0x07000000
-#define CAL_PROPERTY_INSTANCE_ALLDAY            0x08000000
-#define CAL_PROPERTY_UPDATED_INFO               0x09000000
-#define CAL_PROPERTY_EXTENDED                   0x0A000000
-#define CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED   0x0B000000
-#define CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED   0x0C000000
+/* for property                                  0xFF000000 */
+#define CAL_PROPERTY_MASK                        0xFF000000
+#define CAL_PROPERTY_BOOK                        0x01000000
+#define CAL_PROPERTY_EVENT                       0x02000000
+#define CAL_PROPERTY_TODO                        0x03000000
+#define CAL_PROPERTY_TIMEZONE                    0x04000000
+#define CAL_PROPERTY_ATTENDEE                    0x05000000
+#define CAL_PROPERTY_ALARM                       0x06000000
+#define CAL_PROPERTY_INSTANCE_UTIME              0x07000000
+#define CAL_PROPERTY_INSTANCE_LOCALTIME          0x08000000
+#define CAL_PROPERTY_UPDATED_INFO                0x09000000
+#define CAL_PROPERTY_EXTENDED                    0x0A000000
+#define CAL_PROPERTY_INSTANCE_UTIME_EXTENDED     0x0B000000
+#define CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED 0x0C000000
 #define CAL_PROPERTY_CHECK(property_id, data_type) \
        ((property_id&CAL_PROPERTY_MASK) == data_type ? true : false)
 
-#define CAL_PROPERTY_FLAGS_MASK                 0x00F00000
-#define CAL_PROPERTY_FLAGS_FILTER               0x00100000
-#define CAL_PROPERTY_FLAGS_PROJECTION           0x00200000
-#define CAL_PROPERTY_FLAGS_READ_ONLY            0x00300000
+#define CAL_PROPERTY_FLAGS_MASK                  0x00F00000
+#define CAL_PROPERTY_FLAGS_FILTER                0x00100000
+#define CAL_PROPERTY_FLAGS_PROJECTION            0x00200000
+#define CAL_PROPERTY_FLAGS_READ_ONLY             0x00300000
 #define CAL_PROPERTY_CHECK_FLAGS(property_id, data_type) \
        ((property_id&CAL_PROPERTY_FLAGS_MASK) == data_type ? true : false)
 
 typedef enum {
-       CAL_PROPERTY_CALENDAR_ID                = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
-       CAL_PROPERTY_CALENDAR_UID               = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +1,
-       CAL_PROPERTY_CALENDAR_NAME              = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +2,
-       CAL_PROPERTY_CALENDAR_DESCRIPTION       = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +3,
-       CAL_PROPERTY_CALENDAR_COLOR             = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +4,
-       CAL_PROPERTY_CALENDAR_LOCATION          = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +5,
-       CAL_PROPERTY_CALENDAR_VISIBILITY        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_INT) +6,
-       CAL_PROPERTY_CALENDAR_SYNC_EVENT        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_INT) +7,
-       CAL_PROPERTY_CALENDAR_ACCOUNT_ID        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_INT) +8,
-       CAL_PROPERTY_CALENDAR_STORE_TYPE        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_INT) +9,
-       CAL_PROPERTY_CALENDAR_SYNC_DATA1        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +10,
-       CAL_PROPERTY_CALENDAR_SYNC_DATA2        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +11,
-       CAL_PROPERTY_CALENDAR_SYNC_DATA3        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +12,
-       CAL_PROPERTY_CALENDAR_SYNC_DATA4        = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_STR) +13,
-       CAL_PROPERTY_CALENDAR_MODE              = (CAL_PROPERTY_CALENDAR|CAL_PROPERTY_DATA_TYPE_INT) +14,
+       CAL_PROPERTY_BOOK_ID          = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
+       CAL_PROPERTY_BOOK_UID         = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 1,
+       CAL_PROPERTY_BOOK_NAME        = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 2,
+       CAL_PROPERTY_BOOK_DESCRIPTION = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_BOOK_COLOR       = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_BOOK_LOCATION    = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 5,
+       CAL_PROPERTY_BOOK_VISIBILITY  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_INT) + 6,
+       CAL_PROPERTY_BOOK_SYNC_EVENT  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_BOOK_ACCOUNT_ID  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_BOOK_STORE_TYPE  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_BOOK_SYNC_DATA1  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 10,
+       CAL_PROPERTY_BOOK_SYNC_DATA2  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 11,
+       CAL_PROPERTY_BOOK_SYNC_DATA3  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 12,
+       CAL_PROPERTY_BOOK_SYNC_DATA4  = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_STR) + 13,
+       CAL_PROPERTY_BOOK_MODE        = (CAL_PROPERTY_BOOK|CAL_PROPERTY_DATA_TYPE_INT) + 14,
 
        CAL_PROPERTY_EVENT_ID                   = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
-       CAL_PROPERTY_EVENT_CALENDAR_ID          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +1,
-       CAL_PROPERTY_EVENT_SUMMARY              = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +2,
-       CAL_PROPERTY_EVENT_DESCRIPTION          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +3,
-       CAL_PROPERTY_EVENT_LOCATION             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +4,
-       CAL_PROPERTY_EVENT_CATEGORIES           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +5,
-       CAL_PROPERTY_EVENT_EXDATE               = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +6,
-       CAL_PROPERTY_EVENT_EVENT_STATUS         = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +7,
-       CAL_PROPERTY_EVENT_PRIORITY             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +8,
-       CAL_PROPERTY_EVENT_TIMEZONE             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +9,
-       CAL_PROPERTY_EVENT_CONTACT_ID           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +10,
-       CAL_PROPERTY_EVENT_BUSY_STATUS          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +11,
-       CAL_PROPERTY_EVENT_SENSITIVITY          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +12,
-       CAL_PROPERTY_EVENT_UID                  = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +13,
-       CAL_PROPERTY_EVENT_ORGANIZER_NAME       = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +14,
-       CAL_PROPERTY_EVENT_ORGANIZER_EMAIL      = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +15,
-       CAL_PROPERTY_EVENT_MEETING_STATUS       = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +16,
-       CAL_PROPERTY_EVENT_ORIGINAL_EVENT_ID    = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +17,
-       CAL_PROPERTY_EVENT_LATITUDE             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_DOUBLE) +18,
-       CAL_PROPERTY_EVENT_LONGITUDE            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_DOUBLE) +19,
-       CAL_PROPERTY_EVENT_EMAIL_ID             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +20,
-       CAL_PROPERTY_EVENT_CREATED_TIME         = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_LLI) +21,
-       CAL_PROPERTY_EVENT_LAST_MODIFIED_TIME   = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_LLI|CAL_PROPERTY_FLAGS_READ_ONLY) +22,
-       CAL_PROPERTY_EVENT_IS_DELETED           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +23,
-       CAL_PROPERTY_EVENT_FREQ                 = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +24,
-       CAL_PROPERTY_EVENT_RANGE_TYPE           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +25,
-       CAL_PROPERTY_EVENT_UNTIL                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_CALTIME) +26,
-       CAL_PROPERTY_EVENT_COUNT                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +27,
-       CAL_PROPERTY_EVENT_INTERVAL             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +28,
-       CAL_PROPERTY_EVENT_BYSECOND             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +29,
-       CAL_PROPERTY_EVENT_BYMINUTE             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +30,
-       CAL_PROPERTY_EVENT_BYHOUR               = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +31,
-       CAL_PROPERTY_EVENT_BYDAY                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +32,
-       CAL_PROPERTY_EVENT_BYMONTHDAY           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +33,
-       CAL_PROPERTY_EVENT_BYYEARDAY            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +34,
-       CAL_PROPERTY_EVENT_BYWEEKNO             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +35,
-       CAL_PROPERTY_EVENT_BYMONTH              = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +36,
-       CAL_PROPERTY_EVENT_BYSETPOS             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +37,
-       CAL_PROPERTY_EVENT_WKST                 = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +38,
-       CAL_PROPERTY_EVENT_RECURRENCE_ID        = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +39,
-       CAL_PROPERTY_EVENT_RDATE                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +40,
-       CAL_PROPERTY_EVENT_HAS_ATTENDEE         = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +41,
-       CAL_PROPERTY_EVENT_HAS_ALARM            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +42,
-       CAL_PROPERTY_EVENT_SYNC_DATA1           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +43,
-       CAL_PROPERTY_EVENT_SYNC_DATA2           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +44,
-       CAL_PROPERTY_EVENT_SYNC_DATA3           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +45,
-       CAL_PROPERTY_EVENT_SYNC_DATA4           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +46,
-       CAL_PROPERTY_EVENT_START                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_CALTIME) +47,
-       CAL_PROPERTY_EVENT_END                  = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_CALTIME) +48,
-       CAL_PROPERTY_EVENT_CALENDAR_ALARM       = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) +49,
-       CAL_PROPERTY_EVENT_CALENDAR_ATTENDEE    = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) +50,
-       CAL_PROPERTY_EVENT_CALENDAR_SYSTEM_TYPE = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) +51,
-       CAL_PROPERTY_EVENT_START_TZID           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +52,
-       CAL_PROPERTY_EVENT_END_TZID             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) +53,
-       CAL_PROPERTY_EVENT_EXCEPTION            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) +54,
-       CAL_PROPERTY_EVENT_EXTENDED             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) +55,
-       CAL_PROPERTY_EVENT_IS_ALLDAY            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +56,
+       CAL_PROPERTY_EVENT_BOOK_ID              = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_EVENT_SUMMARY              = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 2,
+       CAL_PROPERTY_EVENT_DESCRIPTION          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_EVENT_LOCATION             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_EVENT_CATEGORIES           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 5,
+       CAL_PROPERTY_EVENT_EXDATE               = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 6,
+       CAL_PROPERTY_EVENT_EVENT_STATUS         = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_EVENT_PRIORITY             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_EVENT_TIMEZONE             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_EVENT_CONTACT_ID           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 10,
+       CAL_PROPERTY_EVENT_BUSY_STATUS          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 11,
+       CAL_PROPERTY_EVENT_SENSITIVITY          = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 12,
+       CAL_PROPERTY_EVENT_UID                  = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 13,
+       CAL_PROPERTY_EVENT_ORGANIZER_NAME       = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 14,
+       CAL_PROPERTY_EVENT_ORGANIZER_EMAIL      = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 15,
+       CAL_PROPERTY_EVENT_MEETING_STATUS       = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 16,
+       CAL_PROPERTY_EVENT_ORIGINAL_EVENT_ID    = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 17,
+       CAL_PROPERTY_EVENT_LATITUDE             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 18,
+       CAL_PROPERTY_EVENT_LONGITUDE            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 19,
+       CAL_PROPERTY_EVENT_EMAIL_ID             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 20,
+       CAL_PROPERTY_EVENT_CREATED_TIME         = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_LLI) + 21,
+       CAL_PROPERTY_EVENT_LAST_MODIFIED_TIME   = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_LLI|CAL_PROPERTY_FLAGS_READ_ONLY) + 22,
+       CAL_PROPERTY_EVENT_IS_DELETED           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 23,
+       CAL_PROPERTY_EVENT_FREQ                 = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 24,
+       CAL_PROPERTY_EVENT_RANGE_TYPE           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 25,
+       CAL_PROPERTY_EVENT_UNTIL                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_CALTIME) + 26,
+       CAL_PROPERTY_EVENT_COUNT                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 27,
+       CAL_PROPERTY_EVENT_INTERVAL             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 28,
+       CAL_PROPERTY_EVENT_BYSECOND             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 29,
+       CAL_PROPERTY_EVENT_BYMINUTE             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 30,
+       CAL_PROPERTY_EVENT_BYHOUR               = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 31,
+       CAL_PROPERTY_EVENT_BYDAY                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 32,
+       CAL_PROPERTY_EVENT_BYMONTHDAY           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 33,
+       CAL_PROPERTY_EVENT_BYYEARDAY            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 34,
+       CAL_PROPERTY_EVENT_BYWEEKNO             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 35,
+       CAL_PROPERTY_EVENT_BYMONTH              = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 36,
+       CAL_PROPERTY_EVENT_BYSETPOS             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 37,
+       CAL_PROPERTY_EVENT_WKST                 = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 38,
+       CAL_PROPERTY_EVENT_RECURRENCE_ID        = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 39,
+       CAL_PROPERTY_EVENT_RDATE                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 40,
+       CAL_PROPERTY_EVENT_HAS_ATTENDEE         = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 41,
+       CAL_PROPERTY_EVENT_HAS_ALARM            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 42,
+       CAL_PROPERTY_EVENT_SYNC_DATA1           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 43,
+       CAL_PROPERTY_EVENT_SYNC_DATA2           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 44,
+       CAL_PROPERTY_EVENT_SYNC_DATA3           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 45,
+       CAL_PROPERTY_EVENT_SYNC_DATA4           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 46,
+       CAL_PROPERTY_EVENT_START                = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_CALTIME) + 47,
+       CAL_PROPERTY_EVENT_END                  = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_CALTIME) + 48,
+       CAL_PROPERTY_EVENT_CALENDAR_ALARM       = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) + 49,
+       CAL_PROPERTY_EVENT_CALENDAR_ATTENDEE    = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) + 50,
+       CAL_PROPERTY_EVENT_CALENDAR_SYSTEM_TYPE = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT) + 51,
+       CAL_PROPERTY_EVENT_START_TZID           = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 52,
+       CAL_PROPERTY_EVENT_END_TZID             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_STR) + 53,
+       CAL_PROPERTY_EVENT_EXCEPTION            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) + 54,
+       CAL_PROPERTY_EVENT_EXTENDED             = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_REC) + 55,
+       CAL_PROPERTY_EVENT_IS_ALLDAY            = (CAL_PROPERTY_EVENT|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 56,
 
        CAL_PROPERTY_TODO_ID                    = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
-       CAL_PROPERTY_TODO_CALENDAR_ID           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +1,
-       CAL_PROPERTY_TODO_SUMMARY               = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +2,
-       CAL_PROPERTY_TODO_DESCRIPTION           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +3,
-       CAL_PROPERTY_TODO_LOCATION              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +4,
-       CAL_PROPERTY_TODO_CATEGORIES            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +5,
-       CAL_PROPERTY_TODO_TODO_STATUS           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +6,
-       CAL_PROPERTY_TODO_PRIORITY              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +7,
-       CAL_PROPERTY_TODO_SENSITIVITY           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +8,
-       CAL_PROPERTY_TODO_UID                   = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +9,
-       CAL_PROPERTY_TODO_LATITUDE              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_DOUBLE) +10,
-       CAL_PROPERTY_TODO_LONGITUDE             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_DOUBLE) +11,
-       CAL_PROPERTY_TODO_PROGRESS              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +12,
-       CAL_PROPERTY_TODO_CREATED_TIME          = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_LLI) +13,
-       CAL_PROPERTY_TODO_LAST_MODIFIED_TIME    = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_LLI|CAL_PROPERTY_FLAGS_READ_ONLY) +14,
-       CAL_PROPERTY_TODO_COMPLETED_TIME        = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_LLI) +15,
-       CAL_PROPERTY_TODO_IS_DELETED            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +16,
-       CAL_PROPERTY_TODO_FREQ                  = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +17,
-       CAL_PROPERTY_TODO_RANGE_TYPE            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +18,
-       CAL_PROPERTY_TODO_UNTIL                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_CALTIME) +19,
-       CAL_PROPERTY_TODO_COUNT                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +20,
-       CAL_PROPERTY_TODO_INTERVAL              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +21,
-       CAL_PROPERTY_TODO_BYSECOND              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +22,
-       CAL_PROPERTY_TODO_BYMINUTE              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +23,
-       CAL_PROPERTY_TODO_BYHOUR                = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +24,
-       CAL_PROPERTY_TODO_BYDAY                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +25,
-       CAL_PROPERTY_TODO_BYMONTHDAY            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +26,
-       CAL_PROPERTY_TODO_BYYEARDAY             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +27,
-       CAL_PROPERTY_TODO_BYWEEKNO              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +28,
-       CAL_PROPERTY_TODO_BYMONTH               = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +29,
-       CAL_PROPERTY_TODO_BYSETPOS              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +30,
-       CAL_PROPERTY_TODO_WKST                  = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) +31,
-       CAL_PROPERTY_TODO_HAS_ALARM             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +32,
-       CAL_PROPERTY_TODO_SYNC_DATA1            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +33,
-       CAL_PROPERTY_TODO_SYNC_DATA2            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +34,
-       CAL_PROPERTY_TODO_SYNC_DATA3            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +35,
-       CAL_PROPERTY_TODO_SYNC_DATA4            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +36,
-       CAL_PROPERTY_TODO_START                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_CALTIME) +37,
-       CAL_PROPERTY_TODO_DUE                   = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_CALTIME) +38,
-       CAL_PROPERTY_TODO_CALENDAR_ALARM        = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_REC) +39,
-       CAL_PROPERTY_TODO_START_TZID            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +40,
-       CAL_PROPERTY_TODO_DUE_TZID              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +41,
-       CAL_PROPERTY_TODO_ORGANIZER_NAME        = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +42,
-       CAL_PROPERTY_TODO_ORGANIZER_EMAIL       = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) +43,
-       CAL_PROPERTY_TODO_HAS_ATTENDEE          = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +44,
-       CAL_PROPERTY_TODO_CALENDAR_ATTENDEE     = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_REC) +45,
-       CAL_PROPERTY_TODO_EXTENDED              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_REC) +46,
-       CAL_PROPERTY_TODO_IS_ALLDAY             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) +47,
+       CAL_PROPERTY_TODO_BOOK_ID               = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_TODO_SUMMARY               = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 2,
+       CAL_PROPERTY_TODO_DESCRIPTION           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_TODO_LOCATION              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_TODO_CATEGORIES            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 5,
+       CAL_PROPERTY_TODO_TODO_STATUS           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 6,
+       CAL_PROPERTY_TODO_PRIORITY              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_TODO_SENSITIVITY           = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_TODO_UID                   = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 9,
+       CAL_PROPERTY_TODO_LATITUDE              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 10,
+       CAL_PROPERTY_TODO_LONGITUDE             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 11,
+       CAL_PROPERTY_TODO_PROGRESS              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 12,
+       CAL_PROPERTY_TODO_CREATED_TIME          = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_LLI) + 13,
+       CAL_PROPERTY_TODO_LAST_MODIFIED_TIME    = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_LLI|CAL_PROPERTY_FLAGS_READ_ONLY) + 14,
+       CAL_PROPERTY_TODO_COMPLETED_TIME        = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_LLI) + 15,
+       CAL_PROPERTY_TODO_IS_DELETED            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 16,
+       CAL_PROPERTY_TODO_FREQ                  = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 17,
+       CAL_PROPERTY_TODO_RANGE_TYPE            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 18,
+       CAL_PROPERTY_TODO_UNTIL                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_CALTIME) + 19,
+       CAL_PROPERTY_TODO_COUNT                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 20,
+       CAL_PROPERTY_TODO_INTERVAL              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 21,
+       CAL_PROPERTY_TODO_BYSECOND              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 22,
+       CAL_PROPERTY_TODO_BYMINUTE              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 23,
+       CAL_PROPERTY_TODO_BYHOUR                = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 24,
+       CAL_PROPERTY_TODO_BYDAY                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 25,
+       CAL_PROPERTY_TODO_BYMONTHDAY            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 26,
+       CAL_PROPERTY_TODO_BYYEARDAY             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 27,
+       CAL_PROPERTY_TODO_BYWEEKNO              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 28,
+       CAL_PROPERTY_TODO_BYMONTH               = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 29,
+       CAL_PROPERTY_TODO_BYSETPOS              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 30,
+       CAL_PROPERTY_TODO_WKST                  = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT) + 31,
+       CAL_PROPERTY_TODO_HAS_ALARM             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 32,
+       CAL_PROPERTY_TODO_SYNC_DATA1            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 33,
+       CAL_PROPERTY_TODO_SYNC_DATA2            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 34,
+       CAL_PROPERTY_TODO_SYNC_DATA3            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 35,
+       CAL_PROPERTY_TODO_SYNC_DATA4            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 36,
+       CAL_PROPERTY_TODO_START                 = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_CALTIME) + 37,
+       CAL_PROPERTY_TODO_DUE                   = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_CALTIME) + 38,
+       CAL_PROPERTY_TODO_CALENDAR_ALARM        = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_REC) + 39,
+       CAL_PROPERTY_TODO_START_TZID            = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 40,
+       CAL_PROPERTY_TODO_DUE_TZID              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 41,
+       CAL_PROPERTY_TODO_ORGANIZER_NAME        = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 42,
+       CAL_PROPERTY_TODO_ORGANIZER_EMAIL       = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_STR) + 43,
+       CAL_PROPERTY_TODO_HAS_ATTENDEE          = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 44,
+       CAL_PROPERTY_TODO_CALENDAR_ATTENDEE     = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_REC) + 45,
+       CAL_PROPERTY_TODO_EXTENDED              = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_REC) + 46,
+       CAL_PROPERTY_TODO_IS_ALLDAY             = (CAL_PROPERTY_TODO|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 47,
 
        CAL_PROPERTY_TIMEZONE_ID                                = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
-       CAL_PROPERTY_TIMEZONE_TZ_OFFSET_FROM_GMT                = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+1,
-       CAL_PROPERTY_TIMEZONE_STANDARD_NAME                     = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_STR)+2,
-       CAL_PROPERTY_TIMEZONE_STD_START_MONTH                   = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+3,
-       CAL_PROPERTY_TIMEZONE_STD_START_POSITION_OF_WEEK        = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+4,
-       CAL_PROPERTY_TIMEZONE_STD_START_DAY                     = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+5,
-       CAL_PROPERTY_TIMEZONE_STD_START_HOUR                    = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+6,
-       CAL_PROPERTY_TIMEZONE_STANDARD_BIAS                     = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+7,
-       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_NAME                    = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_STR)+8,
-       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_MONTH             = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+9,
-       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_POSITION_OF_WEEK  = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+10,
-       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_DAY               = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+11,
-       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_HOUR              = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+12,
-       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_BIAS                    = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+13,
-       CAL_PROPERTY_TIMEZONE_CALENDAR_ID                       = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT)+14,
+       CAL_PROPERTY_TIMEZONE_TZ_OFFSET_FROM_GMT                = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_TIMEZONE_STANDARD_NAME                     = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_STR) + 2,
+       CAL_PROPERTY_TIMEZONE_STD_START_MONTH                   = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 3,
+       CAL_PROPERTY_TIMEZONE_STD_START_POSITION_OF_WEEK        = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 4,
+       CAL_PROPERTY_TIMEZONE_STD_START_DAY                     = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 5,
+       CAL_PROPERTY_TIMEZONE_STD_START_HOUR                    = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 6,
+       CAL_PROPERTY_TIMEZONE_STANDARD_BIAS                     = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_NAME                    = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_STR) + 8,
+       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_MONTH             = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_POSITION_OF_WEEK  = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 10,
+       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_DAY               = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 11,
+       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_START_HOUR              = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 12,
+       CAL_PROPERTY_TIMEZONE_DAY_LIGHT_BIAS                    = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 13,
+       CAL_PROPERTY_TIMEZONE_CALENDAR_ID                       = (CAL_PROPERTY_TIMEZONE|CAL_PROPERTY_DATA_TYPE_INT) + 14,
 
-       CAL_PROPERTY_ATTENDEE_NUMBER            = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR),
-       CAL_PROPERTY_ATTENDEE_CUTYPE            = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT)+1,
-       CAL_PROPERTY_ATTENDEE_CT_INDEX          = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT)+2,
-       CAL_PROPERTY_ATTENDEE_UID               = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+3,
-       CAL_PROPERTY_ATTENDEE_GROUP             = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+4,
-       CAL_PROPERTY_ATTENDEE_EMAIL             = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+5,
-       CAL_PROPERTY_ATTENDEE_ROLE              = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT)+6,
-       CAL_PROPERTY_ATTENDEE_STATUS            = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT)+7,
-       CAL_PROPERTY_ATTENDEE_RSVP              = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT)+8,
-       CAL_PROPERTY_ATTENDEE_DELEGATEE_URI     = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+9,
-       CAL_PROPERTY_ATTENDEE_DELEGATOR_URI     = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+10,
-       CAL_PROPERTY_ATTENDEE_NAME              = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+11,
-       CAL_PROPERTY_ATTENDEE_MEMBER            = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR)+12,
-       CAL_PROPERTY_ATTENDEE_PARENT_ID         = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY)+13,
+       CAL_PROPERTY_ATTENDEE_NUMBER        = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR),
+       CAL_PROPERTY_ATTENDEE_CUTYPE        = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_ATTENDEE_CT_INDEX      = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT) + 2,
+       CAL_PROPERTY_ATTENDEE_UID           = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_ATTENDEE_GROUP         = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_ATTENDEE_EMAIL         = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 5,
+       CAL_PROPERTY_ATTENDEE_ROLE          = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT) + 6,
+       CAL_PROPERTY_ATTENDEE_STATUS        = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_ATTENDEE_RSVP          = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_ATTENDEE_DELEGATEE_URI = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 9,
+       CAL_PROPERTY_ATTENDEE_DELEGATOR_URI = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 10,
+       CAL_PROPERTY_ATTENDEE_NAME          = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 11,
+       CAL_PROPERTY_ATTENDEE_MEMBER        = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_STR) + 12,
+       CAL_PROPERTY_ATTENDEE_PARENT_ID     = (CAL_PROPERTY_ATTENDEE|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 13,
 
-       CAL_PROPERTY_ALARM_TICK                 = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT),
-       CAL_PROPERTY_ALARM_TICK_UNIT            = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT)+1,
-       CAL_PROPERTY_ALARM_DESCRIPTION          = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_STR)+2,
-       CAL_PROPERTY_ALARM_PARENT_ID                    = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY)+3,
-       CAL_PROPERTY_ALARM_SUMMARY              = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_STR)+4,
-       CAL_PROPERTY_ALARM_ACTION               = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT)+5,
-       CAL_PROPERTY_ALARM_ATTACH               = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_STR)+6,
-       CAL_PROPERTY_ALARM_ALARM                = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_CALTIME)+7,
+       CAL_PROPERTY_ALARM_TICK        = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT),
+       CAL_PROPERTY_ALARM_TICK_UNIT   = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_ALARM_DESCRIPTION = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_STR) + 2,
+       CAL_PROPERTY_ALARM_PARENT_ID   = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 3,
+       CAL_PROPERTY_ALARM_SUMMARY     = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_ALARM_ACTION      = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_INT) + 5,
+       CAL_PROPERTY_ALARM_ATTACH      = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_STR) + 6,
+       CAL_PROPERTY_ALARM_ALARM       = (CAL_PROPERTY_ALARM|CAL_PROPERTY_DATA_TYPE_CALTIME) + 7,
 
-       CAL_PROPERTY_INSTANCE_NORMAL_EVENT_ID       = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT),
-       CAL_PROPERTY_INSTANCE_NORMAL_START          = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_CALTIME) +1,
-       CAL_PROPERTY_INSTANCE_NORMAL_END            = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_CALTIME) +2,
-       CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY        = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_STR)+3,
-       CAL_PROPERTY_INSTANCE_NORMAL_LOCATION       = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_STR)+4,
-       CAL_PROPERTY_INSTANCE_NORMAL_CALENDAR_ID    = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+5,
-       CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_STR)+6,
-       CAL_PROPERTY_INSTANCE_NORMAL_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+7,
-       CAL_PROPERTY_INSTANCE_NORMAL_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+8,
-       CAL_PROPERTY_INSTANCE_NORMAL_PRIORITY       = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+9,
-       CAL_PROPERTY_INSTANCE_NORMAL_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+10,
-       CAL_PROPERTY_INSTANCE_NORMAL_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+11,
-       CAL_PROPERTY_INSTANCE_NORMAL_LATITUDE       = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_DOUBLE)+12,
-       CAL_PROPERTY_INSTANCE_NORMAL_LONGITUDE      = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_DOUBLE)+13,
-       CAL_PROPERTY_INSTANCE_NORMAL_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+14,
-       CAL_PROPERTY_INSTANCE_NORMAL_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_INT)+15,
-       CAL_PROPERTY_INSTANCE_NORMAL_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_LLI)+16,
-       CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_NORMAL|CAL_PROPERTY_DATA_TYPE_STR)+17,
+       CAL_PROPERTY_INSTANCE_UTIME_EVENT_ID       = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT),
+       CAL_PROPERTY_INSTANCE_UTIME_START          = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_CALTIME) + 1,
+       CAL_PROPERTY_INSTANCE_UTIME_END            = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_CALTIME) + 2,
+       CAL_PROPERTY_INSTANCE_UTIME_SUMMARY        = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_INSTANCE_UTIME_LOCATION       = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_INSTANCE_UTIME_BOOK_ID        = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 5,
+       CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_STR) + 6,
+       CAL_PROPERTY_INSTANCE_UTIME_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_INSTANCE_UTIME_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_INSTANCE_UTIME_PRIORITY       = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_INSTANCE_UTIME_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 10,
+       CAL_PROPERTY_INSTANCE_UTIME_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 11,
+       CAL_PROPERTY_INSTANCE_UTIME_LATITUDE       = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 12,
+       CAL_PROPERTY_INSTANCE_UTIME_LONGITUDE      = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 13,
+       CAL_PROPERTY_INSTANCE_UTIME_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 14,
+       CAL_PROPERTY_INSTANCE_UTIME_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_INT) + 15,
+       CAL_PROPERTY_INSTANCE_UTIME_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_LLI) + 16,
+       CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_UTIME|CAL_PROPERTY_DATA_TYPE_STR) + 17,
 
-       CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_ID       = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT),
-       CAL_PROPERTY_INSTANCE_ALLDAY_START          = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_CALTIME) +1,
-       CAL_PROPERTY_INSTANCE_ALLDAY_END            = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_CALTIME) +2,
-       CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY        = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_STR)+3,
-       CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION       = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_STR)+4,
-       CAL_PROPERTY_INSTANCE_ALLDAY_CALENDAR_ID    = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+5,
-       CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_STR)+6,
-       CAL_PROPERTY_INSTANCE_ALLDAY_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+7,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+8,
-       CAL_PROPERTY_INSTANCE_ALLDAY_PRIORITY       = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+9,
-       CAL_PROPERTY_INSTANCE_ALLDAY_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+10,
-       CAL_PROPERTY_INSTANCE_ALLDAY_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+11,
-       CAL_PROPERTY_INSTANCE_ALLDAY_LATITUDE       = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_DOUBLE)+12,
-       CAL_PROPERTY_INSTANCE_ALLDAY_LONGITUDE      = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_DOUBLE)+13,
-       CAL_PROPERTY_INSTANCE_ALLDAY_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+14,
-       CAL_PROPERTY_INSTANCE_ALLDAY_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT)+15,
-       CAL_PROPERTY_INSTANCE_ALLDAY_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_LLI)+16,
-       CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_STR)+17,
-       CAL_PROPERTY_INSTANCE_ALLDAY_IS_ALLDAY      = (CAL_PROPERTY_INSTANCE_ALLDAY|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY)+18,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_ID       = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT),
+       CAL_PROPERTY_INSTANCE_LOCALTIME_START          = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_CALTIME) + 1,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_END            = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_CALTIME) + 2,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY        = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION       = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_BOOK_ID        = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 5,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_STR) + 6,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_PRIORITY       = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 10,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 11,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_LATITUDE       = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 12,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_LONGITUDE      = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 13,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 14,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT) + 15,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_LLI) + 16,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_STR) + 17,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_IS_ALLDAY      = (CAL_PROPERTY_INSTANCE_LOCALTIME|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 18,
 
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_ID       = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT),
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_START          = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) +1,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_END            = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) +2,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY        = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+3,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION       = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+4,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CALENDAR_ID    = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+5,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+6,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+7,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+8,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_PRIORITY       = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+9,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+10,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+11,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LATITUDE       = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE)+12,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LONGITUDE      = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE)+13,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+14,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+15,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_LLI)+16,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+17,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+18,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES     = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+19,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ATTENDEE   = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+20,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2     = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+21,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3     = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+22,
-       CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4     = (CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+23,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_ID       = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT),
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_START          = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) + 1,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_END            = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) + 2,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY        = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION       = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BOOK_ID        = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 5,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 6,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_PRIORITY       = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 10,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 11,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LATITUDE       = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 12,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LONGITUDE      = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 13,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 14,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 15,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_LLI) + 16,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 17,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 18,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES     = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 19,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ATTENDEE   = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 20,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2     = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 21,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3     = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 22,
+       CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4     = (CAL_PROPERTY_INSTANCE_UTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 23,
 
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_ID       = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT),
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_START          = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) +1,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_END            = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) +2,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY        = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+3,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION       = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+4,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CALENDAR_ID    = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+5,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+6,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+7,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+8,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_PRIORITY       = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+9,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+10,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+11,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LATITUDE       = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE)+12,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LONGITUDE      = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE)+13,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+14,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+15,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_LLI)+16,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+17,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+18,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES     = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+19,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ATTENDEE   = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+20,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2     = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+21,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3     = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+22,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4     = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+23,
-       CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_IS_ALLDAY      = (CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY)+24,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_ID       = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT),
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_START          = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) + 1,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_END            = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_CALTIME) + 2,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY        = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION       = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 4,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BOOK_ID        = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 5,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION    = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 6,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BUSY_STATUS    = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 7,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_STATUS   = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 8,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_PRIORITY       = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 9,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SENSITIVITY    = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 10,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_RRULE      = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 11,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LATITUDE       = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 12,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LONGITUDE      = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_DOUBLE) + 13,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ALARM      = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 14,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORIGINAL_EVENT_ID  = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 15,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LAST_MODIFIED_TIME = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_LLI) + 16,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1     = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 17,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 18,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES     = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 19,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ATTENDEE   = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 20,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2     = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 21,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3     = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 22,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4     = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 23,
+       CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_IS_ALLDAY      = (CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY) + 24,
 
+       CAL_PROPERTY_UPDATED_INFO_ID          = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT),
+       CAL_PROPERTY_UPDATED_INFO_CALENDAR_ID = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_UPDATED_INFO_TYPE        = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT) + 2,
+       CAL_PROPERTY_UPDATED_INFO_VERSION     = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT) + 3,
 
-       CAL_PROPERTY_UPDATED_INFO_ID                = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT),
-       CAL_PROPERTY_UPDATED_INFO_CALENDAR_ID       = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT)+1,
-       CAL_PROPERTY_UPDATED_INFO_TYPE              = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT)+2,
-       CAL_PROPERTY_UPDATED_INFO_VERSION           = (CAL_PROPERTY_UPDATED_INFO|CAL_PROPERTY_DATA_TYPE_INT)+3,
-
-       CAL_PROPERTY_EXTENDED_ID                    = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
-       CAL_PROPERTY_EXTENDED_RECORD_ID             = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+1,
-       CAL_PROPERTY_EXTENDED_RECORD_TYPE           = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT)+2,
-       CAL_PROPERTY_EXTENDED_KEY                   = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+3,
-       CAL_PROPERTY_EXTENDED_VALUE                 = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR)+4,
+       CAL_PROPERTY_EXTENDED_ID           = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT|CAL_PROPERTY_FLAGS_READ_ONLY),
+       CAL_PROPERTY_EXTENDED_RECORD_ID    = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 1,
+       CAL_PROPERTY_EXTENDED_RECORD_TYPE  = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_INT) + 2,
+       CAL_PROPERTY_EXTENDED_KEY          = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 3,
+       CAL_PROPERTY_EXTENDED_VALUE        = (CAL_PROPERTY_EXTENDED|CAL_PROPERTY_DATA_TYPE_STR) + 4,
 
 } cal_property_ids_e;
 
@@ -358,4 +357,5 @@ const cal_property_info_s* cal_view_get_property_info(const char *view_uri, int
 
 const char* cal_view_get_uri(const char *view_uri);
 
-#endif /* __CALENDAR_SVC_VIEW_H__ */
+#endif /* __CALENDAR_SERVICE_VIEW_H__ */
+
index ab835bb..a600f90 100644 (file)
@@ -610,10 +610,10 @@ static GVariant *_todo_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_normal_to_gvariant(calendar_record_h record)
+static GVariant *_instance_utime_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_normal_s *p = (cal_instance_normal_s *)record;
+       cal_instance_utime_s *p = (cal_instance_utime_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -629,10 +629,10 @@ static GVariant *_instance_normal_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_allday_to_gvariant(calendar_record_h record)
+static GVariant *_instance_localtime_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_allday_s *p = (cal_instance_allday_s *)record;
+       cal_instance_localtime_s *p = (cal_instance_localtime_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -649,10 +649,10 @@ static GVariant *_instance_allday_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_normal_extended_to_gvariant(calendar_record_h record)
+static GVariant *_instance_utime_extended_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_normal_extended_s *p = (cal_instance_normal_extended_s *)record;
+       cal_instance_utime_extended_s *p = (cal_instance_utime_extended_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -674,10 +674,10 @@ static GVariant *_instance_normal_extended_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_allday_extended_to_gvariant(calendar_record_h record)
+static GVariant *_instance_localtime_extended_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_allday_extended_s *p = (cal_instance_allday_extended_s *)record;
+       cal_instance_localtime_extended_s *p = (cal_instance_localtime_extended_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -784,7 +784,7 @@ GVariant *cal_dbus_utils_record_to_gvariant(calendar_record_h record)
        }
 
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
+       case CAL_RECORD_TYPE_BOOK:
                arg_record = _book_to_gvariant(record);
                break;
        case CAL_RECORD_TYPE_EVENT:
@@ -802,17 +802,17 @@ GVariant *cal_dbus_utils_record_to_gvariant(calendar_record_h record)
        case CAL_RECORD_TYPE_TIMEZONE:
                arg_record = _timezone_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
-               arg_record = _instance_normal_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME:
+               arg_record = _instance_utime_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
-               arg_record = _instance_allday_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
+               arg_record = _instance_localtime_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-               arg_record = _instance_normal_extended_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+               arg_record = _instance_utime_extended_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-               arg_record = _instance_allday_extended_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+               arg_record = _instance_localtime_extended_to_gvariant(record);
                break;
        case CAL_RECORD_TYPE_UPDATED_INFO:
                arg_record = _updated_info_to_gvariant(record);
@@ -1523,7 +1523,7 @@ static int _gvariant_to_todo(GVariant * arg_record, calendar_record_h *out_recor
 }
 
 
-static int _gvariant_to_instance_normal(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_utime(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1532,7 +1532,7 @@ static int _gvariant_to_instance_normal(GVariant * arg_record, calendar_record_h
        calendar_record_create(_calendar_instance_utime_calendar_book._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_normal_s *p = (cal_instance_normal_s *)record;
+       cal_instance_utime_s *p = (cal_instance_utime_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&s)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1550,7 +1550,7 @@ static int _gvariant_to_instance_normal(GVariant * arg_record, calendar_record_h
        return CALENDAR_ERROR_NONE;
 }
 
-static int _gvariant_to_instance_allday(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_localtime(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1559,7 +1559,7 @@ static int _gvariant_to_instance_allday(GVariant * arg_record, calendar_record_h
        calendar_record_create(_calendar_instance_localtime_calendar_book._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_allday_s *p = (cal_instance_allday_s *)record;
+       cal_instance_localtime_s *p = (cal_instance_localtime_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&si)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1577,7 +1577,7 @@ static int _gvariant_to_instance_allday(GVariant * arg_record, calendar_record_h
        return CALENDAR_ERROR_NONE;
 }
 
-static int _gvariant_to_instance_normal_extended(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_utime_extended(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1586,7 +1586,7 @@ static int _gvariant_to_instance_normal_extended(GVariant * arg_record, calendar
        calendar_record_create(_calendar_instance_utime_calendar_book_extended._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_normal_extended_s *p = (cal_instance_normal_extended_s *)record;
+       cal_instance_utime_extended_s *p = (cal_instance_utime_extended_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&s&si&s&s&s&s)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1610,7 +1610,7 @@ static int _gvariant_to_instance_normal_extended(GVariant * arg_record, calendar
        return CALENDAR_ERROR_NONE;
 }
 
-static int _gvariant_to_instance_allday_extended(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_localtime_extended(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1619,7 +1619,7 @@ static int _gvariant_to_instance_allday_extended(GVariant * arg_record, calendar
        calendar_record_create(_calendar_instance_localtime_calendar_book_extended._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_allday_extended_s *p = (cal_instance_allday_extended_s *)record;
+       cal_instance_localtime_extended_s *p = (cal_instance_localtime_extended_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&s&si&s&s&s&s)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1663,7 +1663,7 @@ static int _gvariant_to_record(int type, GVariant *arg_common, GVariant *arg_rec
 
        calendar_record_h record = NULL;
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
+       case CAL_RECORD_TYPE_BOOK:
                _gvariant_to_book(arg_record, &record);
                break;
        case CAL_RECORD_TYPE_EVENT:
@@ -1681,17 +1681,17 @@ static int _gvariant_to_record(int type, GVariant *arg_common, GVariant *arg_rec
        case CAL_RECORD_TYPE_TIMEZONE:
                _gvariant_to_timezone(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
-               _gvariant_to_instance_normal(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME:
+               _gvariant_to_instance_utime(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
-               _gvariant_to_instance_allday(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
+               _gvariant_to_instance_localtime(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-               _gvariant_to_instance_normal_extended(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+               _gvariant_to_instance_utime_extended(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-               _gvariant_to_instance_allday_extended(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+               _gvariant_to_instance_localtime_extended(arg_record, &record);
                break;
        case CAL_RECORD_TYPE_UPDATED_INFO:
                _gvariant_to_updated_info(arg_record, &record);
index 81d72f9..347d6b8 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_DBUS_UTILS_H__
-#define __CALENDAR_SVC_DBUS_UTILS_H__
+#ifndef __CALENDAR_SERVICE_DBUS_UTILS_H__
+#define __CALENDAR_SERVICE_DBUS_UTILS_H__
 
 /*
  * DBUS_INTERFACE name validation.
@@ -47,4 +47,4 @@ int cal_dbus_utils_gvariant_to_query(GVariant *arg_query, calendar_query_h *quer
 int cal_dbus_utils_gvariant_to_ids(GVariant *arg_ids, int count, int **ids);
 int cal_dbus_utils_gvariant_to_stream(GVariant *arg_stream, int *out_size, char **out_stream);
 
-#endif /*__CALENDAR_SVC_DBUS_UTILS_H__ */
+#endif /*__CALENDAR_SERVICE_DBUS_UTILS_H__ */
index 0c197cc..ecaddec 100644 (file)
@@ -1,6 +1,6 @@
 Name:       calendar-service
 Summary:    DB library for calendar
-Version:    0.1.167
+Version:    0.1.168
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
index f12ae4b..858dfaa 100644 (file)
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __CALENDAR_SVC_ACCESS_CONTROL_H__
-#define __CALENDAR_SVC_ACCESS_CONTROL_H__
+#ifndef __CALENDAR_SERVICE_ACCESS_CONTROL_H__
+#define __CALENDAR_SERVICE_ACCESS_CONTROL_H__
 
 #include "cal_typedef.h"
 
@@ -33,4 +33,4 @@ bool cal_access_control_have_write_permission(int book_id);
 int cal_is_owner(int book_id);
 
 
-#endif /*  __CALENDAR_SVC_ACCESS_CONTROL_H__ */
+#endif /*  __CALENDAR_SERVICE_ACCESS_CONTROL_H__ */
index d52e327..4b06bc9 100644 (file)
@@ -37,7 +37,7 @@
 #include "cal_inotify.h"
 #include "cal_db.h"
 #include "cal_access_control.h"
-#include "cal_db_plugin_calendar_helper.h"
+#include "cal_db_plugin_book_helper.h"
 #include "cal_time.h"
 #include "cal_server_alarm.h"
 #include "cal_server_contacts.h"
@@ -129,9 +129,9 @@ static void _cal_server_create_file(void)
        _cal_server_create_directory(DATA_PATH, 0775);
        _cal_server_create_directory(CAL_DATA_PATH, 0775);
 
-       _cal_server_set_directory_permission(CAL_NOTI_CALENDAR_CHANGED, 0660);
-       _cal_server_set_directory_permission(CAL_NOTI_EVENT_CHANGED, 0660);
-       _cal_server_set_directory_permission(CAL_NOTI_TODO_CHANGED, 0660);
+       _cal_server_set_directory_permission(CAL_NOTI_FILE_BOOK, 0660);
+       _cal_server_set_directory_permission(CAL_NOTI_FILE_EVENT, 0660);
+       _cal_server_set_directory_permission(CAL_NOTI_FILE_TODO, 0660);
 }
 
 int cal_server_get_timeout(void)
index 430d37e..e012a37 100644 (file)
@@ -23,7 +23,7 @@
 #include "calendar.h"
 #include "cal_typedef.h"
 #include "cal_internal.h"
-#include "cal_db_plugin_calendar_helper.h"
+#include "cal_db_plugin_book_helper.h"
 #include "cal_server_contacts.h"
 
 static pthread_mutex_t cal_mutex_account = PTHREAD_MUTEX_INITIALIZER;
index b333a26..3c515c1 100644 (file)
  *
  */
 
-#ifndef __CALENDAR_SVC_ACCOUNT_H__
-#define __CALENDAR_SVC_ACCOUNT_H__
+#ifndef __CALENDAR_SERVICE_ACCOUNT_H__
+#define __CALENDAR_SERVICE_ACCOUNT_H__
 
 int cal_server_account_init(void);
 void cal_server_account_deinit(void);
 
-#endif /*__CALENDAR_SVC_ACCOUNT_H__ */
+#endif /*__CALENDAR_SERVICE_ACCOUNT_H__ */
index 95b5388..8782700 100644 (file)
@@ -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)
index d11e0c5..1a24569 100644 (file)
  *
  */
 
-#ifndef __CALENDAR_SVC_ONDEMAND_H__
-#define __CALENDAR_SVC_ONDEMAND_H__
+#ifndef __CALENDAR_SERVICE_ONDEMAND_H__
+#define __CALENDAR_SERVICE_ONDEMAND_H__
 
 void cal_server_ondemand_stop(void);
 void cal_server_ondemand_start(void);
 void cal_server_ondemand_hold(void);
 void cal_server_ondemand_release(void);
 
-#endif /*__CALENDAR_SVC_ONDEMAND_H__ */
+#endif /*__CALENDAR_SERVICE_ONDEMAND_H__ */
index 19d583a..4be16eb 100644 (file)
  *
  */
 
-#ifndef __CALENDAR_SVC_CALENDAR_H__
-#define __CALENDAR_SVC_CALENDAR_H__
+#ifndef __CALENDAR_SERVICE_CALENDAR_H__
+#define __CALENDAR_SERVICE_CALENDAR_H__
 
 void cal_service_internal_disconnect(void);
 int cal_connect(void);
 int cal_disconnect(void);
 
-#endif /* __CALENDAR_SVC_CALENDAR_H__ */
+#endif /* __CALENDAR_SERVICE_CALENDAR_H__ */
index 1e8f328..80b232b 100644 (file)
 /*
  * Declear DB plugin
  */
-extern cal_db_plugin_cb_s cal_db_calendar_plugin_cb;
+extern cal_db_plugin_cb_s cal_db_book_plugin_cb;
 extern cal_db_plugin_cb_s cal_db_event_plugin_cb;
-extern cal_db_plugin_cb_s cal_db_instance_normal_plugin_cb;
-extern cal_db_plugin_cb_s cal_db_instance_normal_extended_plugin_cb;
-extern cal_db_plugin_cb_s cal_db_instance_allday_plugin_cb;
-extern cal_db_plugin_cb_s cal_db_instance_allday_extended_plugin_cb;
+extern cal_db_plugin_cb_s cal_db_instance_utime_plugin_cb;
+extern cal_db_plugin_cb_s cal_db_instance_utime_extended_plugin_cb;
+extern cal_db_plugin_cb_s cal_db_instance_localtime_plugin_cb;
+extern cal_db_plugin_cb_s cal_db_instance_localtime_extended_plugin_cb;
 extern cal_db_plugin_cb_s cal_db_todo_plugin_cb;
 extern cal_db_plugin_cb_s cal_db_alarm_plugin_cb;
 extern cal_db_plugin_cb_s cal_db_attendee_plugin_cb;
@@ -90,8 +90,8 @@ int cal_db_append_string(char **dst, const char *src)
 cal_db_plugin_cb_s* _cal_db_get_plugin(cal_record_type_e type)
 {
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
-               return (&cal_db_calendar_plugin_cb);
+       case CAL_RECORD_TYPE_BOOK:
+               return (&cal_db_book_plugin_cb);
        case CAL_RECORD_TYPE_EVENT:
                return (&cal_db_event_plugin_cb);
        case CAL_RECORD_TYPE_TODO:
@@ -102,14 +102,14 @@ cal_db_plugin_cb_s* _cal_db_get_plugin(cal_record_type_e type)
                return (&cal_db_attendee_plugin_cb);
        case CAL_RECORD_TYPE_TIMEZONE:
                return (&cal_db_timezone_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
-               return (&cal_db_instance_normal_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
-               return (&cal_db_instance_allday_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-               return (&cal_db_instance_normal_extended_plugin_cb);
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-               return (&cal_db_instance_allday_extended_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME:
+               return (&cal_db_instance_utime_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
+               return (&cal_db_instance_localtime_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+               return (&cal_db_instance_utime_extended_plugin_cb);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+               return (&cal_db_instance_localtime_extended_plugin_cb);
        case CAL_RECORD_TYPE_SEARCH:
                return (&cal_db_search_plugin_cb);
        case CAL_RECORD_TYPE_EXTENDED:
@@ -196,7 +196,7 @@ void cal_db_initialize_view_table(void)
        }
 
        /*
-        * CAL_VIEW_TABLE_NORMAL_INSTANCE  : CALENDAR_VIEW_INSTANCE_NORMAL_CALENDAR
+        * CAL_VIEW_TABLE_UTIME_INSTANCE  : CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR
         * normal_instance_table + schedule_table(type=1) + calendar_table
         * A = normal_instace_table
         * B = schedule_table
@@ -215,8 +215,8 @@ void cal_db_initialize_view_table(void)
                        "FROM %s as A, %s as B, %s as C "
                        "ON A.event_id = B.id AND B.calendar_id = C.id "
                        "where C.deleted = 0 AND B.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_NORMAL_INSTANCE,
-                       CAL_TABLE_NORMAL_INSTANCE,
+                       CAL_VIEW_TABLE_UTIME_INSTANCE,
+                       CAL_TABLE_UTIME_INSTANCE,
                        CAL_TABLE_SCHEDULE,
                        CAL_TABLE_CALENDAR);
        ret = cal_db_util_query_exec(query);
@@ -227,7 +227,7 @@ void cal_db_initialize_view_table(void)
                /* LCOV_EXCL_STOP */
        }
 
-       /* CAL_VIEW_TABLE_ALLDAY_INSTANCE  : CALENDAR_VIEW_INSTANCE_ALLDAY_CALENDAR */
+       /* CAL_VIEW_TABLE_LOCALTIME_INSTANCE  : CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR */
        snprintf(query, sizeof(query),
                        "CREATE VIEW IF NOT EXISTS %s AS SELECT A.event_id, "
                        "B.dtstart_type, B.dtstart_utime, A.dtstart_datetime, "
@@ -241,8 +241,8 @@ void cal_db_initialize_view_table(void)
                        "FROM %s as A, %s as B, %s as C "
                        "ON A.event_id = B.id AND B.calendar_id = C.id "
                        "where C.deleted = 0 AND B.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_ALLDAY_INSTANCE,
-                       CAL_TABLE_ALLDAY_INSTANCE,
+                       CAL_VIEW_TABLE_LOCALTIME_INSTANCE,
+                       CAL_TABLE_LOCALTIME_INSTANCE,
                        CAL_TABLE_SCHEDULE,
                        CAL_TABLE_CALENDAR);
        ret = cal_db_util_query_exec(query);
@@ -254,7 +254,7 @@ void cal_db_initialize_view_table(void)
        }
 
        /*
-        * CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED  : CALENDAR_VIEW_INSTANCE_NORMAL_CALENDAR_EXTENDED
+        * CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED  : CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED
         * normal_instance_table + schedule_table(type=1) + calendar_table
         * A = normal_instace_table
         * B = schedule_table
@@ -273,8 +273,8 @@ void cal_db_initialize_view_table(void)
                        "FROM %s as A, %s as B, %s as C "
                        "ON A.event_id = B.id AND B.calendar_id = C.id "
                        "where C.deleted = 0 AND B.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED,
-                       CAL_TABLE_NORMAL_INSTANCE,
+                       CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED,
+                       CAL_TABLE_UTIME_INSTANCE,
                        CAL_TABLE_SCHEDULE,
                        CAL_TABLE_CALENDAR);
        ret = cal_db_util_query_exec(query);
@@ -285,7 +285,7 @@ void cal_db_initialize_view_table(void)
                /* LCOV_EXCL_STOP */
        }
 
-       /* CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED  : CALENDAR_VIEW_INSTANCE_ALLDAY_CALENDAR_EXTENDED */
+       /* CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED  : CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED */
        snprintf(query, sizeof(query),
                        "CREATE VIEW IF NOT EXISTS %s AS SELECT A.event_id, "
                        "B.dtstart_type, B.dtstart_utime, A.dtstart_datetime, "
@@ -299,8 +299,8 @@ void cal_db_initialize_view_table(void)
                        "FROM %s as A, %s as B, %s as C "
                        "ON A.event_id = B.id AND B.calendar_id = C.id "
                        "where C.deleted = 0 AND B.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED,
-                       CAL_TABLE_ALLDAY_INSTANCE,
+                       CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED,
+                       CAL_TABLE_LOCALTIME_INSTANCE,
                        CAL_TABLE_SCHEDULE,
                        CAL_TABLE_CALENDAR);
        ret = cal_db_util_query_exec(query);
@@ -312,7 +312,7 @@ void cal_db_initialize_view_table(void)
        }
 
        /*
-        * event_calendar view  :  CALENDAR_VIEW_EVENT_CALENDAR
+        * event_calendar view  :  CALENDAR_VIEW_EVENT_BOOK
         * A : schedule_table
         * B : rrule_table
         * C : calendar_table
@@ -328,7 +328,7 @@ void cal_db_initialize_view_table(void)
                        "JOIN %s C ON A.calendar_id = C.id "
                        "LEFT OUTER JOIN %s B ON A.id = B.event_id "
                        "WHERE A.type = 1 AND c.deleted = 0 AND A.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_EVENT_CALENDAR,
+                       CAL_VIEW_TABLE_EVENT_BOOK,
                        CAL_TABLE_SCHEDULE, CAL_TABLE_CALENDAR,
                        CAL_TABLE_RRULE);
        ret = cal_db_util_query_exec(query);
@@ -340,7 +340,7 @@ void cal_db_initialize_view_table(void)
        }
 
        /*
-        * todo_calendar view  : CALENDAR_VIEW_TODO_CALENDAR
+        * todo_calendar view  : CALENDAR_VIEW_TODO_BOOK
         * A : schedule_table
         * B : rrule_table
         * C : calendar_table
@@ -356,7 +356,7 @@ void cal_db_initialize_view_table(void)
                        "JOIN %s C ON A.calendar_id = C.id "
                        "LEFT OUTER JOIN %s B ON A.id = B.event_id "
                        "WHERE A.type = 2 AND c.deleted = 0 AND A.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_TODO_CALENDAR,
+                       CAL_VIEW_TABLE_TODO_BOOK,
                        CAL_TABLE_SCHEDULE, CAL_TABLE_CALENDAR,
                        CAL_TABLE_RRULE);
        ret = cal_db_util_query_exec(query);
@@ -368,7 +368,7 @@ void cal_db_initialize_view_table(void)
        }
 
        /*
-        * event_calendar_attendee view  :  CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE
+        * event_calendar_attendee view  :  CALENDAR_VIEW_EVENT_BOOK_ATTENDEE
         * A : schedule_table
         * B : attendee_table
         * C : calendar_table
@@ -386,7 +386,7 @@ void cal_db_initialize_view_table(void)
                        "JOIN %s C ON A.calendar_id = C.id "
                        "LEFT OUTER JOIN %s D ON A.id = D.event_id "
                        "WHERE A.type = 1 AND c.deleted = 0 AND A.is_deleted = 0 ",
-                       CAL_VIEW_TABLE_EVENT_CALENDAR_ATTENDEE,
+                       CAL_VIEW_TABLE_EVENT_BOOK_ATTENDEE,
                        CAL_TABLE_SCHEDULE, CAL_TABLE_ATTENDEE, CAL_TABLE_CALENDAR,
                        CAL_TABLE_RRULE);
        ret = cal_db_util_query_exec(query);
index 0d819aa..32976b7 100644 (file)
 #define CAL_TABLE_VERSION "version_table"
 #define CAL_TABLE_DELETED "deleted_table"
 #define CAL_TABLE_RRULE "rrule_table"
-#define CAL_TABLE_NORMAL_INSTANCE "normal_instance_table"
-#define CAL_TABLE_ALLDAY_INSTANCE "allday_instance_table"
+#define CAL_TABLE_UTIME_INSTANCE "normal_instance_table"
+#define CAL_TABLE_LOCALTIME_INSTANCE "allday_instance_table"
 #define CAL_TABLE_EXTENDED "extended_table"
 
 /* for event or todo.. */
 #define CAL_VIEW_TABLE_EVENT "event_view"
 #define CAL_VIEW_TABLE_TODO "todo_view"
-#define CAL_VIEW_TABLE_EVENT_CALENDAR "event_calendar_view"
-#define CAL_VIEW_TABLE_TODO_CALENDAR "todo_calendar_view"
-#define CAL_VIEW_TABLE_EVENT_CALENDAR_ATTENDEE "event_calendar_attendee_view"
-#define CAL_VIEW_TABLE_NORMAL_INSTANCE "normal_instance_view"
-#define CAL_VIEW_TABLE_ALLDAY_INSTANCE "allday_instance_view"
-#define CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED "normal_instance_view_extended"
-#define CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED "allday_instance_view_extended"
+#define CAL_VIEW_TABLE_EVENT_BOOK "event_book_view"
+#define CAL_VIEW_TABLE_TODO_BOOK "todo_book_view"
+#define CAL_VIEW_TABLE_EVENT_BOOK_ATTENDEE "event_calendar_attendee_view"
+#define CAL_VIEW_TABLE_UTIME_INSTANCE "utime_instance_view"
+#define CAL_VIEW_TABLE_LOCALTIME_INSTANCE "localtime_instance_view"
+#define CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED "utime_instance_view_extended"
+#define CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED "localtime_instance_view_extended"
 
 #define CAL_QUERY_SCHEDULE_A_ALL "A.id, A.type, A.summary, A.description, A.location, A.categories, A.exdate, A.task_status, "\
                                "A.priority, A.timezone, A.contact_id, A.busy_status, A.sensitivity, A.uid, A.organizer_name, "\
index f46aaf9..2f1d936 100644 (file)
@@ -237,7 +237,6 @@ static int __get_exdate_list(UCalendar *ucal, cal_event_s *event, GList **list)
                UErrorCode ec = U_ZERO_ERROR;
                switch (strlen(p)) {
                case 8:
-                       DBG("ALLDAY instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDD, &y, &m, &d);
 
                        ucal2 = ucal_clone(ucal, &ec);
@@ -247,7 +246,6 @@ static int __get_exdate_list(UCalendar *ucal, cal_event_s *event, GList **list)
                        break;
 
                case 15:
-                       DBG("ALLDAY instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDDTHHMMSS, &y, &m, &d, &h, &n, &s);
 
                        ucal2 = ucal_clone(ucal, &ec);
@@ -257,7 +255,6 @@ static int __get_exdate_list(UCalendar *ucal, cal_event_s *event, GList **list)
                        break;
 
                case 16:
-                       DBG("NORMAL instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDDTHHMMSSZ, &y, &m, &d, &h, &n, &s);
                        lli = cal_time_convert_itol(NULL, y, m, d, h, n, s);
                        break;
@@ -310,32 +307,29 @@ static int _cal_db_instance_update_exdate_mod(int original_event_id, char *recur
                char buf[CAL_STR_SHORT_LEN32] = {0};
                switch (strlen(p)) {
                case 8:
-                       DBG("ALLDAY instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDD, &y, &m, &d);
                        snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d", y, m, d, 0, 0, 0);
                        snprintf(query, sizeof(query),
                                        "DELETE FROM %s "
                                        "WHERE event_id = %d AND dtstart_datetime = '%s' ",
-                                       CAL_TABLE_ALLDAY_INSTANCE,
+                                       CAL_TABLE_LOCALTIME_INSTANCE,
                                        original_event_id, buf);
                        break;
 
                case 15:
-                       DBG("ALLDAY instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDDTHHMMSS, &y, &m, &d, &h, &n, &s);
                        snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d", y, m, d, h, n, s);
                        snprintf(query, sizeof(query),
                                        "DELETE FROM %s "
                                        "WHERE event_id = %d AND dtstart_datetime = '%s' ",
-                                       CAL_TABLE_ALLDAY_INSTANCE,
+                                       CAL_TABLE_LOCALTIME_INSTANCE,
                                        original_event_id, buf);
                        break;
 
                case 16:
-                       DBG("NORMAL instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDDTHHMMSSZ, &y, &m, &d, &h, &n, &s);
                        snprintf(query, sizeof(query), "DELETE FROM %s WHERE event_id=%d AND dtstart_utime=%lld ",
-                                       CAL_TABLE_NORMAL_INSTANCE, original_event_id, cal_time_convert_itol(NULL, y, m, d, h, n, s));
+                                       CAL_TABLE_UTIME_INSTANCE, original_event_id, cal_time_convert_itol(NULL, y, m, d, h, n, s));
                        DBG("(%lld)", cal_time_convert_itol(NULL, y, m, d, h, n, s));
                        break;
                }
@@ -402,18 +396,18 @@ static int _cal_db_instance_del_inundant(int event_id, calendar_time_s *st, cal_
                                "WHERE event_id = %d "
                                "AND dtstart_utime > (SELECT dtstart_utime FROM %s "
                                "WHERE event_id = %d ORDER BY dtstart_utime LIMIT %d, 1) ",
-                               CAL_TABLE_NORMAL_INSTANCE,
+                               CAL_TABLE_UTIME_INSTANCE,
                                event_id,
-                               CAL_TABLE_NORMAL_INSTANCE,
+                               CAL_TABLE_UTIME_INSTANCE,
                                event_id, cnt -1);
 
        } else if (st->type == CALENDAR_TIME_LOCALTIME) {
                snprintf(query, sizeof(query), "DELETE FROM %s WHERE event_id = %d "
                                "AND dtstart_datetime > (SELECT dtstart_datetime FROM %s "
                                "WHERE event_id = %d ORDER BY dtstart_datetime LIMIT %d, 1) ",
-                               CAL_TABLE_ALLDAY_INSTANCE,
+                               CAL_TABLE_LOCALTIME_INSTANCE,
                                event_id,
-                               CAL_TABLE_ALLDAY_INSTANCE,
+                               CAL_TABLE_LOCALTIME_INSTANCE,
                                event_id, cnt -1);
        }
 
@@ -531,7 +525,7 @@ static int _cal_db_instance_insert_record(UCalendar *ucal, long long int duratio
                }
                snprintf(buf_e, sizeof(buf_e), CAL_FORMAT_LOCAL_DATETIME, y, m, d, h, n, s);
                ret = cal_db_instance_helper_insert_localtime_instance(event->index, buf_s, buf_e);
-               RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_db_instance_allday_insert_record() failed(%d)", ret);
+               RETVM_IF(CALENDAR_ERROR_NONE != ret, ret, "cal_db_instance_localtime_insert_record() failed(%d)", ret);
                break;
        }
        __print_ucal(event->system_type, ucal, NULL, 1);
@@ -1875,18 +1869,17 @@ int cal_db_instance_update_exdate_del(int id, char *exdate)
                int len = strlen(p);
                switch (len) {
                case 8: /* 20141212 */
-                       DBG("ALLDAY instance");
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDD, &y, &m, &d);
                        snprintf(query, sizeof(query), "DELETE FROM %s "
                                        "WHERE event_id = %d AND dtstart_datetime = '%04d-%02d-%02dT%02d:%02d:%02d' ",
-                                       CAL_TABLE_ALLDAY_INSTANCE, id, y, m, d, h, n, s);
+                                       CAL_TABLE_LOCALTIME_INSTANCE, id, y, m, d, h, n, s);
                        break;
 
                case 15: /* 20141212T000000 */
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDDTHHMMSS, &y, &m, &d, &h, &n, &s);
                        snprintf(query, sizeof(query), "DELETE FROM %s "
                                        "WHERE event_id = %d AND dtstart_datetime = '%04d-%02d-%02dT%02d:%02d:%02d' ",
-                                       CAL_TABLE_ALLDAY_INSTANCE, id, y, m, d, h, n, s);
+                                       CAL_TABLE_LOCALTIME_INSTANCE, id, y, m, d, h, n, s);
                        DBG("localtime instance");
                        break;
 
@@ -1894,8 +1887,8 @@ int cal_db_instance_update_exdate_del(int id, char *exdate)
                        sscanf(p, CAL_DATETIME_FORMAT_YYYYMMDDTHHMMSSZ, &y, &m, &d, &h, &n, &s);
                        snprintf(query, sizeof(query), "DELETE FROM %s "
                                        "WHERE event_id = %d AND dtstart_utime = %lld ",
-                                       CAL_TABLE_NORMAL_INSTANCE, id, cal_time_convert_itol(NULL, y, m, d, h, n, s));
-                       DBG("normal instance (%lld)", cal_time_convert_itol(NULL, y, m, d, h, n, s));
+                                       CAL_TABLE_UTIME_INSTANCE, id, cal_time_convert_itol(NULL, y, m, d, h, n, s));
+                       DBG("utime instance (%lld)", cal_time_convert_itol(NULL, y, m, d, h, n, s));
                        break;
                }
 
@@ -1975,9 +1968,9 @@ int cal_db_instance_discard_record(int index)
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        int ret = 0;
 
-       DBG("delete normal");
+       DBG("delete utime");
        snprintf(query, sizeof(query), "DELETE FROM %s WHERE event_id = %d ",
-                       CAL_TABLE_NORMAL_INSTANCE, index);
+                       CAL_TABLE_UTIME_INSTANCE, index);
 
        ret = cal_db_util_query_exec(query);
        if (CALENDAR_ERROR_NONE != ret) {
@@ -1988,9 +1981,9 @@ int cal_db_instance_discard_record(int index)
                /* LCOV_EXCL_STOP */
        }
 
-       DBG("delete allday");
+       DBG("delete localtime");
        snprintf(query, sizeof(query), "DELETE FROM %s WHERE event_id = %d ",
-                       CAL_TABLE_ALLDAY_INSTANCE, index);
+                       CAL_TABLE_LOCALTIME_INSTANCE, index);
 
        ret = cal_db_util_query_exec(query);
        if (CALENDAR_ERROR_NONE != ret) {
index 648d3a8..e371706 100644 (file)
@@ -29,7 +29,7 @@ int cal_db_instance_helper_insert_utime_instance(int event_id, long long int s,
        int ret = 0;
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "INSERT INTO %s (event_id, dtstart_utime, dtend_utime) "
-                       "VALUES (%d, %lld, %lld) ", CAL_TABLE_NORMAL_INSTANCE, event_id, s, e);
+                       "VALUES (%d, %lld, %lld) ", CAL_TABLE_UTIME_INSTANCE, event_id, s, e);
 
        ret = cal_db_util_query_exec(query);
        if (CALENDAR_ERROR_NONE != ret) {
@@ -47,7 +47,7 @@ int cal_db_instance_helper_insert_localtime_instance(int event_id, const char *s
        int ret = 0;
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "INSERT INTO %s (event_id, dtstart_datetime, dtend_datetime) "
-                       "VALUES (%d, '%s', '%s') ", CAL_TABLE_ALLDAY_INSTANCE, event_id, s, e);
+                       "VALUES (%d, '%s', '%s') ", CAL_TABLE_LOCALTIME_INSTANCE, event_id, s, e);
 
        ret = cal_db_util_query_exec(query);
        if (CALENDAR_ERROR_NONE != ret) {
similarity index 84%
rename from server/db/cal_db_plugin_calendar.c
rename to server/db/cal_db_plugin_book.c
index 9fba60a..33627e5 100644 (file)
 /*
  * db plugin function
  */
-static int _cal_db_calendar_insert_record(calendar_record_h record, int* id);
-static int _cal_db_calendar_get_record(int id, calendar_record_h* out_record);
-static int _cal_db_calendar_update_record(calendar_record_h record);
-static int _cal_db_calendar_delete_record(int id);
-static int _cal_db_calendar_get_all_records(int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_calendar_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_calendar_delete_records(int ids[], int count);
-static int _cal_db_calendar_get_count(int *out_count);
-static int _cal_db_calendar_get_count_with_query(calendar_query_h query, int *out_count);
-static int _cal_db_calendar_replace_record(calendar_record_h record, int id);
+static int _cal_db_book_insert_record(calendar_record_h record, int* id);
+static int _cal_db_book_get_record(int id, calendar_record_h* out_record);
+static int _cal_db_book_update_record(calendar_record_h record);
+static int _cal_db_book_delete_record(int id);
+static int _cal_db_book_get_all_records(int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_book_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_book_delete_records(int ids[], int count);
+static int _cal_db_book_get_count(int *out_count);
+static int _cal_db_book_get_count_with_query(calendar_query_h query, int *out_count);
+static int _cal_db_book_replace_record(calendar_record_h record, int id);
 
 /*
  * static function
  */
-static void _cal_db_calendar_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
-static void _cal_db_calendar_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_book_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
+static void _cal_db_book_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int stmt_count, calendar_record_h record);
-static void _cal_db_calendar_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_book_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record);
-static int _cal_db_calendar_update_projection(calendar_record_h record);
+static int _cal_db_book_update_projection(calendar_record_h record);
 
-cal_db_plugin_cb_s cal_db_calendar_plugin_cb = {
+cal_db_plugin_cb_s cal_db_book_plugin_cb = {
        .is_query_only = false,
-       .insert_record = _cal_db_calendar_insert_record,
-       .get_record = _cal_db_calendar_get_record,
-       .update_record = _cal_db_calendar_update_record,
-       .delete_record = _cal_db_calendar_delete_record,
-       .get_all_records = _cal_db_calendar_get_all_records,
-       .get_records_with_query = _cal_db_calendar_get_records_with_query,
+       .insert_record = _cal_db_book_insert_record,
+       .get_record = _cal_db_book_get_record,
+       .update_record = _cal_db_book_update_record,
+       .delete_record = _cal_db_book_delete_record,
+       .get_all_records = _cal_db_book_get_all_records,
+       .get_records_with_query = _cal_db_book_get_records_with_query,
        .insert_records = NULL, /* use insert record with bulk count */
        .update_records = NULL,
-       .delete_records = _cal_db_calendar_delete_records,
-       .get_count = _cal_db_calendar_get_count,
-       .get_count_with_query = _cal_db_calendar_get_count_with_query,
-       .replace_record = _cal_db_calendar_replace_record,
+       .delete_records = _cal_db_book_delete_records,
+       .get_count = _cal_db_book_get_count,
+       .get_count_with_query = _cal_db_book_get_count_with_query,
+       .replace_record = _cal_db_book_replace_record,
        .replace_records = NULL
 };
 
-static bool _cal_db_calendar_check_value_validation(cal_book_s* calendar)
+static bool _cal_db_book_check_value_validation(cal_book_s* calendar)
 {
        RETVM_IF(NULL == calendar, CALENDAR_ERROR_INVALID_PARAMETER, "calendar is NULL");
 
@@ -95,7 +95,7 @@ static bool _cal_db_calendar_check_value_validation(cal_book_s* calendar)
        return true;
 }
 
-static int _cal_db_calendar_insert_record(calendar_record_h record, int* id)
+static int _cal_db_book_insert_record(calendar_record_h record, int* id)
 {
        CAL_FN_CALL();
 
@@ -104,9 +104,9 @@ static int _cal_db_calendar_insert_record(calendar_record_h record, int* id)
        RETV_IF(NULL == record, CALENDAR_ERROR_INVALID_PARAMETER);
 
        cal_book_s *book =  (cal_book_s *)(record);
-       if (false == _cal_db_calendar_check_value_validation(book)) {
+       if (false == _cal_db_book_check_value_validation(book)) {
                /* LCOV_EXCL_START */
-               ERR("cal_db_calendar_check_value_validation() Fail");
+               ERR("cal_db_book_check_value_validation() Fail");
                return CALENDAR_ERROR_INVALID_PARAMETER;
                /* LCOV_EXCL_STOP */
        }
@@ -174,12 +174,12 @@ static int _cal_db_calendar_insert_record(calendar_record_h record, int* id)
        if (id)
                *id = index;
 
-       cal_db_util_notify(CAL_NOTI_TYPE_CALENDAR);
+       cal_db_util_notify(CAL_NOTI_TYPE_BOOK);
 
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_get_record(int id, calendar_record_h* out_record)
+static int _cal_db_book_get_record(int id, calendar_record_h* out_record)
 {
        char query[CAL_DB_SQL_MAX_LEN];
        sqlite3_stmt *stmt = NULL;
@@ -219,28 +219,28 @@ static int _cal_db_calendar_get_record(int id, calendar_record_h* out_record)
                /* LCOV_EXCL_STOP */
        }
 
-       _cal_db_calendar_get_stmt(stmt, *out_record);
+       _cal_db_book_get_stmt(stmt, *out_record);
        sqlite3_finalize(stmt);
 
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_update_record(calendar_record_h record)
+static int _cal_db_book_update_record(calendar_record_h record)
 {
        int ret = 0;
 
        RETV_IF(NULL == record, CALENDAR_ERROR_INVALID_PARAMETER);
 
        cal_book_s* book =  (cal_book_s*)(record);
-       if (false == _cal_db_calendar_check_value_validation(book)) {
+       if (false == _cal_db_book_check_value_validation(book)) {
                /* LCOV_EXCL_START */
-               ERR("cal_db_calendar_check_value_validation() Fail");
+               ERR("cal_db_book_check_value_validation() Fail");
                return CALENDAR_ERROR_INVALID_PARAMETER;
                /* LCOV_EXCL_STOP */
        }
 
        if (book->common.properties_flags != NULL)
-               return _cal_db_calendar_update_projection(record);
+               return _cal_db_book_update_projection(record);
 
 
        char query[CAL_DB_SQL_MAX_LEN] = {0};
@@ -291,12 +291,12 @@ static int _cal_db_calendar_update_record(calendar_record_h record)
                /* LCOV_EXCL_STOP */
        }
        sqlite3_finalize(stmt);
-       cal_db_util_notify(CAL_NOTI_TYPE_CALENDAR);
+       cal_db_util_notify(CAL_NOTI_TYPE_BOOK);
 
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_delete_record(int id)
+static int _cal_db_book_delete_record(int id)
 {
        int ret = CALENDAR_ERROR_NONE;
        char query[CAL_DB_SQL_MAX_LEN] = {0};
@@ -314,7 +314,7 @@ static int _cal_db_calendar_delete_record(int id)
 
        int count = 0;
        int count2 = 0;
-       snprintf(query, sizeof(query), "select count(*) from %s", CAL_TABLE_NORMAL_INSTANCE);
+       snprintf(query, sizeof(query), "select count(*) from %s", CAL_TABLE_UTIME_INSTANCE);
        ret = cal_db_util_query_get_first_int_result(query, NULL, &count);
        if (CALENDAR_ERROR_NONE != ret) {
                /* LCOV_EXCL_START */
@@ -323,7 +323,7 @@ static int _cal_db_calendar_delete_record(int id)
                /* LCOV_EXCL_STOP */
        }
 
-       snprintf(query, sizeof(query), "select count(*) from %s", CAL_TABLE_ALLDAY_INSTANCE);
+       snprintf(query, sizeof(query), "select count(*) from %s", CAL_TABLE_LOCALTIME_INSTANCE);
        ret = cal_db_util_query_get_first_int_result(query, NULL, &count2);
        if (CALENDAR_ERROR_NONE != ret) {
                /* LCOV_EXCL_START */
@@ -355,27 +355,27 @@ static int _cal_db_calendar_delete_record(int id)
 
        cal_access_control_reset();
 
-       cal_db_util_notify(CAL_NOTI_TYPE_CALENDAR);
+       cal_db_util_notify(CAL_NOTI_TYPE_BOOK);
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_replace_record(calendar_record_h record, int id)
+static int _cal_db_book_replace_record(calendar_record_h record, int id)
 {
        int ret = 0;
 
        RETV_IF(NULL == record, CALENDAR_ERROR_INVALID_PARAMETER);
 
        cal_book_s *book =  (cal_book_s *)(record);
-       if (false == _cal_db_calendar_check_value_validation(book)) {
+       if (false == _cal_db_book_check_value_validation(book)) {
                /* LCOV_EXCL_START */
-               ERR("cal_db_calendar_check_value_validation() Fail");
+               ERR("cal_db_book_check_value_validation() Fail");
                return CALENDAR_ERROR_INVALID_PARAMETER;
                /* LCOV_EXCL_STOP */
        }
 
        book->index = id;
        if (book->common.properties_flags)
-               return _cal_db_calendar_update_projection(record);
+               return _cal_db_book_update_projection(record);
 
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        snprintf(query, sizeof(query), "UPDATE %s SET "
@@ -425,12 +425,12 @@ static int _cal_db_calendar_replace_record(calendar_record_h record, int id)
                /* LCOV_EXCL_STOP */
        }
        sqlite3_finalize(stmt);
-       cal_db_util_notify(CAL_NOTI_TYPE_CALENDAR);
+       cal_db_util_notify(CAL_NOTI_TYPE_BOOK);
 
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_get_all_records(int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_book_get_all_records(int offset, int limit, calendar_list_h* out_list)
 {
        int ret = CALENDAR_ERROR_NONE;
        char offsetquery[CAL_DB_SQL_MAX_LEN] = {0};
@@ -478,7 +478,7 @@ static int _cal_db_calendar_get_all_records(int offset, int limit, calendar_list
                        return ret;
                        /* LCOV_EXCL_STOP */
                }
-               _cal_db_calendar_get_stmt(stmt, record);
+               _cal_db_book_get_stmt(stmt, record);
 
                ret = calendar_list_add(*out_list, record);
                if (CALENDAR_ERROR_NONE != ret) {
@@ -498,7 +498,7 @@ static int _cal_db_calendar_get_all_records(int offset, int limit, calendar_list
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_book_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
 {
        cal_query_s *que = NULL;
        int i = 0;
@@ -625,11 +625,11 @@ static int _cal_db_calendar_get_records_with_query(calendar_query_h query, int o
                        cal_record_set_projection(record,
                                        que->projection, que->projection_count, que->property_count);
 
-                       _cal_db_calendar_get_projection_stmt(stmt,
+                       _cal_db_book_get_projection_stmt(stmt,
                                        que->projection, que->projection_count,
                                        record);
                } else {
-                       _cal_db_calendar_get_stmt(stmt, record);
+                       _cal_db_book_get_stmt(stmt, record);
                }
 
                ret = calendar_list_add(*out_list, record);
@@ -661,15 +661,15 @@ static int _cal_db_calendar_get_records_with_query(calendar_query_h query, int o
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_delete_records(int ids[], int count)
+static int _cal_db_book_delete_records(int ids[], int count)
 {
        int ret = 0;
        int i = 0;
        for (i = 0; i < count; i++) {
-               ret = _cal_db_calendar_delete_record(ids[i]);
+               ret = _cal_db_book_delete_record(ids[i]);
                if (CALENDAR_ERROR_NONE != ret) {
                        /* LCOV_EXCL_START */
-                       ERR("_cal_db_calendar_delete_record() Fail(%d)", ret);
+                       ERR("_cal_db_book_delete_record() Fail(%d)", ret);
                        return CALENDAR_ERROR_DB_FAILED;
                        /* LCOV_EXCL_STOP */
                }
@@ -677,7 +677,7 @@ static int _cal_db_calendar_delete_records(int ids[], int count)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_get_count(int *out_count)
+static int _cal_db_book_get_count(int *out_count)
 {
        RETV_IF(NULL == out_count, CALENDAR_ERROR_INVALID_PARAMETER);
 
@@ -703,7 +703,7 @@ static int _cal_db_calendar_get_count(int *out_count)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_calendar_get_count_with_query(calendar_query_h query, int *out_count)
+static int _cal_db_book_get_count_with_query(calendar_query_h query, int *out_count)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -714,7 +714,7 @@ static int _cal_db_calendar_get_count_with_query(calendar_query_h query, int *ou
 
        que = (cal_query_s *)query;
 
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_CALENDAR)) {
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_BOOK)) {
                table_name = cal_strdup(CAL_TABLE_CALENDAR);
        } else {
                /* LCOV_EXCL_START */
@@ -775,7 +775,7 @@ static int _cal_db_calendar_get_count_with_query(calendar_query_h query, int *ou
        return CALENDAR_ERROR_NONE;
 }
 
-static void _cal_db_calendar_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
+static void _cal_db_book_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
 {
        cal_book_s* calendar =  (cal_book_s*)(record);
        int count = 0;
@@ -825,65 +825,65 @@ static void _cal_db_calendar_get_stmt(sqlite3_stmt *stmt, calendar_record_h reco
        sqlite3_column_text(stmt, count++);
 }
 
-static void _cal_db_calendar_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_book_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int stmt_count, calendar_record_h record)
 {
        cal_book_s* calendar =  (cal_book_s*)(record);
        const unsigned char *temp;
 
        switch (property) {
-       case CAL_PROPERTY_CALENDAR_ID:
+       case CAL_PROPERTY_BOOK_ID:
                calendar->index = sqlite3_column_int(stmt, stmt_count);
                break;
-       case CAL_PROPERTY_CALENDAR_UID:
+       case CAL_PROPERTY_BOOK_UID:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->uid = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_NAME:
+       case CAL_PROPERTY_BOOK_NAME:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->name = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_DESCRIPTION:
+       case CAL_PROPERTY_BOOK_DESCRIPTION:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->description = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_COLOR:
+       case CAL_PROPERTY_BOOK_COLOR:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->color = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_LOCATION:
+       case CAL_PROPERTY_BOOK_LOCATION:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->location = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_VISIBILITY:
+       case CAL_PROPERTY_BOOK_VISIBILITY:
                calendar->visibility = sqlite3_column_int(stmt, stmt_count);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_EVENT:
+       case CAL_PROPERTY_BOOK_SYNC_EVENT:
                calendar->sync_event = sqlite3_column_int(stmt, stmt_count);
                break;
-       case CAL_PROPERTY_CALENDAR_ACCOUNT_ID:
+       case CAL_PROPERTY_BOOK_ACCOUNT_ID:
                calendar->account_id = sqlite3_column_int(stmt, stmt_count);
                break;
-       case CAL_PROPERTY_CALENDAR_STORE_TYPE:
+       case CAL_PROPERTY_BOOK_STORE_TYPE:
                calendar->store_type = sqlite3_column_int(stmt, stmt_count);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA1:
+       case CAL_PROPERTY_BOOK_SYNC_DATA1:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA2:
+       case CAL_PROPERTY_BOOK_SYNC_DATA2:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA3:
+       case CAL_PROPERTY_BOOK_SYNC_DATA3:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_SYNC_DATA4:
+       case CAL_PROPERTY_BOOK_SYNC_DATA4:
                temp = sqlite3_column_text(stmt, stmt_count);
                calendar->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_CALENDAR_MODE:
+       case CAL_PROPERTY_BOOK_MODE:
                calendar->mode = sqlite3_column_int(stmt, stmt_count);
                break;
        default:
@@ -893,17 +893,17 @@ static void _cal_db_calendar_get_property_stmt(sqlite3_stmt *stmt,
        return;
 }
 
-static void _cal_db_calendar_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_book_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record)
 {
        int i = 0;
 
        for (i = 0; i < projection_count; i++)
-               _cal_db_calendar_get_property_stmt(stmt, projection[i], i, record);
+               _cal_db_book_get_property_stmt(stmt, projection[i], i, record);
 }
 
-static int _cal_db_calendar_update_projection(calendar_record_h record)
+static int _cal_db_book_update_projection(calendar_record_h record)
 {
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        sqlite3_stmt *stmt = NULL;
@@ -959,7 +959,7 @@ static int _cal_db_calendar_update_projection(calendar_record_h record)
 
        sqlite3_finalize(stmt);
 
-       cal_db_util_notify(CAL_NOTI_TYPE_CALENDAR);
+       cal_db_util_notify(CAL_NOTI_TYPE_BOOK);
 
        CAL_FREE(set);
        if (bind_text) {
similarity index 98%
rename from server/db/cal_db_plugin_calendar_helper.c
rename to server/db/cal_db_plugin_book_helper.c
index d8e85fd..d77c2ae 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "cal_db.h"
 #include "cal_db_query.h"
-#include "cal_db_plugin_calendar_helper.h"
+#include "cal_db_plugin_book_helper.h"
 #include "cal_db_util.h"
 
 int cal_db_delete_account(int account_id)
index c89e481..533af83 100644 (file)
@@ -63,7 +63,7 @@ static int _cal_db_event_exception_delete_with_id(int original_id);
 static int _cal_db_event_exception_get_ids(int original_id, GList **out_list);
 static int _cal_db_event_exception_update(cal_list_s *exception_list_s, int original_id, int calendar_id, int is_dirty_in_time, time_t time_diff, int old_type, int new_type);
 static int _cal_db_event_get_deleted_data(int id, int* calendar_book_id, int* created_ver, int* original_event_id, char** recurrence_id);
-static int _cal_db_event_exdate_insert_normal(int event_id, const char* original_exdate, const char* exdate, int **exception_id, int *exception_len);
+static int _cal_db_event_exdate_insert_utime(int event_id, const char* original_exdate, const char* exdate, int **exception_id, int *exception_len);
 static bool _cal_db_event_check_calendar_book_type(calendar_record_h record);
 
 static void __check_list(calendar_list_h l)
@@ -1134,10 +1134,10 @@ static int _cal_db_event_get_records_with_query(calendar_query_h query, int offs
 
        if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT)) {
                table_name = cal_strdup(CAL_VIEW_TABLE_EVENT);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_CALENDAR);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_CALENDAR_ATTENDEE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_BOOK);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK_ATTENDEE)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_BOOK_ATTENDEE);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -1375,10 +1375,10 @@ static int _cal_db_event_get_count_with_query(calendar_query_h query, int *out_c
 
        if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT)) {
                table_name = cal_strdup(CAL_VIEW_TABLE_EVENT);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_CALENDAR);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_CALENDAR_ATTENDEE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_BOOK);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK_ATTENDEE)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_BOOK_ATTENDEE);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -1898,7 +1898,7 @@ static void _cal_db_event_get_property_stmt(sqlite3_stmt *stmt,
        case CAL_PROPERTY_EVENT_ID:
                event->index = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_EVENT_CALENDAR_ID:
+       case CAL_PROPERTY_EVENT_BOOK_ID:
                event->calendar_id = sqlite3_column_int(stmt, *stmt_count);
                break;
        case CAL_PROPERTY_EVENT_SUMMARY:
@@ -2245,7 +2245,7 @@ static int _cal_db_event_update_dirty(calendar_record_h record, int is_dirty_in_
                        ret = calendar_record_get_str_p(record, property_info[i]. property_id, &record_exdate);
                        if (CALENDAR_ERROR_NONE != ret)
                                continue;
-                       ret = calendar_record_get_int(original_record, CAL_PROPERTY_EVENT_CALENDAR_ID, &calendar_id);
+                       ret = calendar_record_get_int(original_record, CAL_PROPERTY_EVENT_BOOK_ID, &calendar_id);
                        if (CALENDAR_ERROR_NONE != ret)
                                continue;
 
@@ -2261,14 +2261,14 @@ static int _cal_db_event_update_dirty(calendar_record_h record, int is_dirty_in_
                        if (CALENDAR_ERROR_NONE != ret)
                                continue;
                        if (sync_event_type == CALENDAR_BOOK_SYNC_EVENT_FOR_EVERY_AND_REMAIN) {
-                               ret = _cal_db_event_exdate_insert_normal(event_id, original_exdate,
+                               ret = _cal_db_event_exdate_insert_utime(event_id, original_exdate,
                                                record_exdate, NULL, NULL);
                                WARN_IF(CALENDAR_ERROR_NONE != ret, "%s->%s", original_exdate, record_exdate);
 
                        } else {
                                int *exception_ids = NULL;
                                int exception_len = 0;
-                               ret = _cal_db_event_exdate_insert_normal(event_id, original_exdate,
+                               ret = _cal_db_event_exdate_insert_utime(event_id, original_exdate,
                                                record_exdate, &exception_ids, &exception_len);
                                WARN_IF(CALENDAR_ERROR_NONE != ret, "%s->%s", original_exdate, record_exdate);
                                ret = _cal_db_event_delete_exception(exception_ids, exception_len);
@@ -2620,7 +2620,7 @@ static int _cal_db_event_get_deleted_data(int id, int* book_id, int* created_ver
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_event_exdate_insert_normal(int event_id, const char* original_exdate,
+static int _cal_db_event_exdate_insert_utime(int event_id, const char* original_exdate,
                const char* exdate, int **exception_ids, int *exception_len)
 {
        int ret = CALENDAR_ERROR_NONE;
index 57e64d2..2c30330 100644 (file)
@@ -84,7 +84,7 @@ int cal_db_event_check_value_validation(cal_event_s *event)
 
        if (event->start.type != event->end.type) {
                /* LCOV_EXCL_START */
-               ERR("normal end(%lld) < start(%lld)",
+               ERR("utime end(%lld) < start(%lld)",
                                event->end.time.utime, event->start.time.utime);
                return CALENDAR_ERROR_INVALID_PARAMETER;
                /* LCOV_EXCL_STOP */
@@ -94,7 +94,7 @@ int cal_db_event_check_value_validation(cal_event_s *event)
        case CALENDAR_TIME_UTIME:
                if (event->end.time.utime < event->start.time.utime) {
                        /* LCOV_EXCL_START */
-                       ERR("normal end(%lld) < start(%lld) so set same", event->end.time.utime, event->start.time.utime);
+                       ERR("utime end(%lld) < start(%lld) so set same", event->end.time.utime, event->start.time.utime);
                        event->end.time.utime =  event->start.time.utime;
                        return CALENDAR_ERROR_INVALID_PARAMETER;
                        /* LCOV_EXCL_STOP */
@@ -333,7 +333,7 @@ static void __get_next_instance_caltime(int parent_id, calendar_time_s *caltime,
        case CALENDAR_TIME_UTIME:
                snprintf(query, sizeof(query), "SELECT dtstart_utime, dtend_utime FROM %s WHERE event_id=%d AND dtstart_utime>%lld "
                                "ORDER BY dtstart_utime ASC LIMIT 1",
-                               CAL_TABLE_NORMAL_INSTANCE, parent_id, caltime->time.utime);
+                               CAL_TABLE_UTIME_INSTANCE, parent_id, caltime->time.utime);
 
                ret = cal_db_util_query_prepare(query, &stmt);
                if (CALENDAR_ERROR_NONE != ret) {
@@ -356,7 +356,7 @@ static void __get_next_instance_caltime(int parent_id, calendar_time_s *caltime,
                snprintf(query, sizeof(query), "SELECT dtstart_datetime, dtend_datetime FROM %s "
                                "WHERE event_id=%d AND dtstart_datetime>'%04d-%02d-%02dT%02d:%02d:%02d' "
                                "ORDER BY dtstart_datetime ASC LIMIT 1",
-                               CAL_TABLE_ALLDAY_INSTANCE, parent_id,
+                               CAL_TABLE_LOCALTIME_INSTANCE, parent_id,
                                caltime->time.date.year, caltime->time.date.month, caltime->time.date.mday,
                                caltime->time.date.hour, caltime->time.date.minute, caltime->time.date.second);
 
@@ -400,7 +400,7 @@ static void __get_last_instance_caltime(int parent_id, int type, calendar_time_s
        case CALENDAR_TIME_UTIME:
                snprintf(query, sizeof(query), "SELECT dtstart_utime FROM %s WHERE event_id=%d "
                                "ORDER BY dtstart_utime DESC LIMIT 1",
-                               CAL_TABLE_NORMAL_INSTANCE, parent_id);
+                               CAL_TABLE_UTIME_INSTANCE, parent_id);
                ret = cal_db_util_query_prepare(query, &stmt);
                if (CALENDAR_ERROR_NONE != ret) {
                        /* LCOV_EXCL_START */
@@ -418,7 +418,7 @@ static void __get_last_instance_caltime(int parent_id, int type, calendar_time_s
        case CALENDAR_TIME_LOCALTIME:
                snprintf(query, sizeof(query), "SELECT dtstart_datetime FROM %s WHERE event_id=%d "
                                "ORDER BY dtstart_datetime DESC LIMIT 1",
-                               CAL_TABLE_ALLDAY_INSTANCE, parent_id);
+                               CAL_TABLE_LOCALTIME_INSTANCE, parent_id);
                ret = cal_db_util_query_prepare(query, &stmt);
                if (CALENDAR_ERROR_NONE != ret) {
                        /* LCOV_EXCL_START */
@@ -451,11 +451,11 @@ static void __del_recurence_id_instance(calendar_time_s *rectime, int parent_id)
        switch (rectime->type) {
        case CALENDAR_TIME_UTIME:
                snprintf(query, sizeof(query), "DELETE FROM %s WHERE dtstart_utime=%lld AND event_id=%d",
-                               CAL_TABLE_NORMAL_INSTANCE, rectime->time.utime, parent_id);
+                               CAL_TABLE_UTIME_INSTANCE, rectime->time.utime, parent_id);
                break;
        case CALENDAR_TIME_LOCALTIME:
                snprintf(query, sizeof(query), "DELETE FROM %s WHERE dtstart_datetime='%04d-%02d-%02dT%02d:%02d:%02d' AND event_id=%d",
-                               CAL_TABLE_ALLDAY_INSTANCE, rectime->time.date.year, rectime->time.date.month, rectime->time.date.mday,
+                               CAL_TABLE_LOCALTIME_INSTANCE, rectime->time.date.year, rectime->time.date.month, rectime->time.date.mday,
                                rectime->time.date.hour, rectime->time.date.minute, rectime->time.date.second, parent_id);
                break;
        }
similarity index 80%
rename from server/db/cal_db_plugin_instance_allday.c
rename to server/db/cal_db_plugin_instance_localtime.c
index f287ff4..eca9993 100644 (file)
 #include "cal_access_control.h"
 #include "cal_utils.h"
 
-static int _cal_db_instance_allday_delete_record(int id);
-static int _cal_db_instance_allday_get_all_records(int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_allday_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_allday_get_count(int *out_count);
-static int _cal_db_instance_allday_get_count_with_query(calendar_query_h query, int *out_count);
+static int _cal_db_instance_localtime_delete_record(int id);
+static int _cal_db_instance_localtime_get_all_records(int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_localtime_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_localtime_get_count(int *out_count);
+static int _cal_db_instance_localtime_get_count_with_query(calendar_query_h query, int *out_count);
 
 /*
  * static function
  */
-static void _cal_db_instance_allday_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
-static void _cal_db_instance_allday_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
+static void _cal_db_instance_localtime_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record);
-static void _cal_db_instance_allday_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record);
 
-cal_db_plugin_cb_s cal_db_instance_allday_plugin_cb = {
+cal_db_plugin_cb_s cal_db_instance_localtime_plugin_cb = {
        .is_query_only = false,
        .insert_record = NULL,
        .get_record = NULL,
        .update_record = NULL,
-       .delete_record = _cal_db_instance_allday_delete_record,
-       .get_all_records = _cal_db_instance_allday_get_all_records,
-       .get_records_with_query = _cal_db_instance_allday_get_records_with_query,
+       .delete_record = _cal_db_instance_localtime_delete_record,
+       .get_all_records = _cal_db_instance_localtime_get_all_records,
+       .get_records_with_query = _cal_db_instance_localtime_get_records_with_query,
        .insert_records = NULL,
        .update_records = NULL,
        .delete_records = NULL,
-       .get_count = _cal_db_instance_allday_get_count,
-       .get_count_with_query = _cal_db_instance_allday_get_count_with_query,
+       .get_count = _cal_db_instance_localtime_get_count,
+       .get_count_with_query = _cal_db_instance_localtime_get_count_with_query,
        .replace_record = NULL,
        .replace_records = NULL
 };
 
-static int _cal_db_instance_allday_delete_record(int id)
+static int _cal_db_instance_localtime_delete_record(int id)
 {
        char query[CAL_DB_SQL_MAX_LEN] = {0};
        int ret = 0;
@@ -70,7 +70,7 @@ static int _cal_db_instance_allday_delete_record(int id)
        RETVM_IF(id < 0, CALENDAR_ERROR_INVALID_PARAMETER, "Invalid argument: id(%d) < 0", id);
 
        snprintf(query, sizeof(query), "DELETE FROM %s WHERE event_id = %d ",
-                       CAL_TABLE_ALLDAY_INSTANCE, id);
+                       CAL_TABLE_LOCALTIME_INSTANCE, id);
 
        ret = cal_db_util_query_exec(query);
        if (CALENDAR_ERROR_NONE != ret) {
@@ -84,7 +84,7 @@ static int _cal_db_instance_allday_delete_record(int id)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_get_all_records(int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_localtime_get_all_records(int offset, int limit, calendar_list_h* out_list)
 {
        int ret = CALENDAR_ERROR_NONE;
        char offsetquery[CAL_DB_SQL_MAX_LEN] = {0};
@@ -103,7 +103,7 @@ static int _cal_db_instance_allday_get_all_records(int offset, int limit, calend
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT * FROM");
-       cal_db_append_string(&query_str, CAL_VIEW_TABLE_ALLDAY_INSTANCE);
+       cal_db_append_string(&query_str, CAL_VIEW_TABLE_LOCALTIME_INSTANCE);
        cal_db_append_string(&query_str, limitquery);
        cal_db_append_string(&query_str, offsetquery);
 
@@ -133,7 +133,7 @@ static int _cal_db_instance_allday_get_all_records(int offset, int limit, calend
                        /* LCOV_EXCL_STOP */
                }
 
-               _cal_db_instance_allday_get_stmt(stmt, record);
+               _cal_db_instance_localtime_get_stmt(stmt, record);
 
                ret = calendar_list_add(*out_list, record);
                if (CALENDAR_ERROR_NONE != ret) {
@@ -153,7 +153,7 @@ static int _cal_db_instance_allday_get_all_records(int offset, int limit, calend
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_localtime_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -166,10 +166,10 @@ static int _cal_db_instance_allday_get_records_with_query(calendar_query_h query
 
        que = (cal_query_s *)query;
 
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -290,9 +290,9 @@ static int _cal_db_instance_allday_get_records_with_query(calendar_query_h query
                }
                if (0 < que->projection_count) {
                        cal_record_set_projection(record, que->projection, que->projection_count, que->property_count);
-                       _cal_db_instance_allday_get_projection_stmt(stmt, que->projection, que->projection_count, record);
+                       _cal_db_instance_localtime_get_projection_stmt(stmt, que->projection, que->projection_count, record);
                } else {
-                       _cal_db_instance_allday_get_stmt(stmt, record);
+                       _cal_db_instance_localtime_get_stmt(stmt, record);
                }
 
                ret = calendar_list_add(*out_list, record);
@@ -325,13 +325,13 @@ static int _cal_db_instance_allday_get_records_with_query(calendar_query_h query
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_get_count(int *out_count)
+static int _cal_db_instance_localtime_get_count(int *out_count)
 {
        RETV_IF(NULL == out_count, CALENDAR_ERROR_INVALID_PARAMETER);
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT count(*) FROM");
-       cal_db_append_string(&query_str, CAL_TABLE_ALLDAY_INSTANCE);
+       cal_db_append_string(&query_str, CAL_TABLE_LOCALTIME_INSTANCE);
 
        int ret = 0;
        int count = 0;
@@ -350,7 +350,7 @@ static int _cal_db_instance_allday_get_count(int *out_count)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_get_count_with_query(calendar_query_h query, int *out_count)
+static int _cal_db_instance_localtime_get_count_with_query(calendar_query_h query, int *out_count)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -361,10 +361,10 @@ static int _cal_db_instance_allday_get_count_with_query(calendar_query_h query,
 
        que = (cal_query_s *)query;
 
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -423,9 +423,9 @@ static int _cal_db_instance_allday_get_count_with_query(calendar_query_h query,
        return CALENDAR_ERROR_NONE;
 }
 
-static void _cal_db_instance_allday_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
+static void _cal_db_instance_localtime_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
 {
-       cal_instance_allday_s* instance =  (cal_instance_allday_s*)(record);
+       cal_instance_localtime_s* instance =  (cal_instance_localtime_s*)(record);
        const unsigned char *temp;
        int count = 0;
 
@@ -490,14 +490,14 @@ static void _cal_db_instance_allday_get_stmt(sqlite3_stmt *stmt, calendar_record
        return;
 }
 
-static void _cal_db_instance_allday_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record)
 {
-       cal_instance_allday_s* instance =  (cal_instance_allday_s*)(record);
+       cal_instance_localtime_s* instance =  (cal_instance_localtime_s*)(record);
        const unsigned char *temp;
 
        switch (property) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_START:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_START:
                instance->start.type = CALENDAR_TIME_LOCALTIME;
                *stmt_count = *stmt_count+1; /* utime */
                *stmt_count = *stmt_count+1;
@@ -510,7 +510,7 @@ static void _cal_db_instance_allday_get_property_stmt(sqlite3_stmt *stmt,
                }
                break;
 
-       case CAL_PROPERTY_INSTANCE_ALLDAY_END:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_END:
                instance->end.type = CALENDAR_TIME_LOCALTIME;
                *stmt_count = *stmt_count+1; /* utime */
                *stmt_count = *stmt_count+1;
@@ -522,62 +522,62 @@ static void _cal_db_instance_allday_get_property_stmt(sqlite3_stmt *stmt,
                                        &(instance->end.time.date.second));
                }
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SUMMARY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SUMMARY:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->summary = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LOCATION:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LOCATION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->location = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_CALENDAR_ID:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_BOOK_ID:
                instance->calendar_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_DESCRIPTION:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_DESCRIPTION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->description = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_BUSY_STATUS:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_BUSY_STATUS:
                instance->busy_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_STATUS:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_STATUS:
                instance->event_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_PRIORITY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_PRIORITY:
                instance->priority = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SENSITIVITY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SENSITIVITY:
                instance->sensitivity = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_HAS_RRULE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_RRULE:
                instance->has_rrule = sqlite3_column_int(stmt, *stmt_count);
                if (0 < instance->has_rrule)
                        instance->has_rrule = 1;
 
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LATITUDE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LATITUDE:
                instance->latitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LONGITUDE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LONGITUDE:
                instance->longitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EVENT_ID:
                instance->event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_HAS_ALARM:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_HAS_ALARM:
                instance->has_alarm = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_ORIGINAL_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_ORIGINAL_EVENT_ID:
                instance->original_event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_LAST_MODIFIED_TIME:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_LAST_MODIFIED_TIME:
                instance->last_mod = sqlite3_column_int64(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_SYNC_DATA1:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_SYNC_DATA1:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_IS_ALLDAY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_IS_ALLDAY:
                instance->is_allday = sqlite3_column_int64(stmt, *stmt_count);
                break;
 
@@ -591,7 +591,7 @@ static void _cal_db_instance_allday_get_property_stmt(sqlite3_stmt *stmt,
        return;
 }
 
-static void _cal_db_instance_allday_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record)
 {
@@ -599,5 +599,5 @@ static void _cal_db_instance_allday_get_projection_stmt(sqlite3_stmt *stmt,
        int stmt_count = 0;
 
        for (i = 0; i < projection_count; i++)
-               _cal_db_instance_allday_get_property_stmt(stmt, projection[i], &stmt_count, record);
+               _cal_db_instance_localtime_get_property_stmt(stmt, projection[i], &stmt_count, record);
 }
 #include "cal_access_control.h"
 #include "cal_utils.h"
 
-static int _cal_db_instance_allday_extended_get_all_records(int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_allday_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_allday_extended_get_count(int *out_count);
-static int _cal_db_instance_allday_extended_get_count_with_query(calendar_query_h query, int *out_count);
+static int _cal_db_instance_localtime_extended_get_all_records(int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_localtime_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_localtime_extended_get_count(int *out_count);
+static int _cal_db_instance_localtime_extended_get_count_with_query(calendar_query_h query, int *out_count);
 
 /*
  * static function
  */
-static void _cal_db_instance_allday_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
-static void _cal_db_instance_allday_extended_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
+static void _cal_db_instance_localtime_extended_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record);
-static void _cal_db_instance_allday_extended_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_extended_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record);
 
-cal_db_plugin_cb_s cal_db_instance_allday_extended_plugin_cb = {
+cal_db_plugin_cb_s cal_db_instance_localtime_extended_plugin_cb = {
        .is_query_only = false,
        .insert_record = NULL,
        .get_record = NULL,
        .update_record = NULL,
        .delete_record = NULL,
-       .get_all_records = _cal_db_instance_allday_extended_get_all_records,
-       .get_records_with_query = _cal_db_instance_allday_extended_get_records_with_query,
+       .get_all_records = _cal_db_instance_localtime_extended_get_all_records,
+       .get_records_with_query = _cal_db_instance_localtime_extended_get_records_with_query,
        .insert_records = NULL,
        .update_records = NULL,
        .delete_records = NULL,
-       .get_count = _cal_db_instance_allday_extended_get_count,
-       .get_count_with_query = _cal_db_instance_allday_extended_get_count_with_query,
+       .get_count = _cal_db_instance_localtime_extended_get_count,
+       .get_count_with_query = _cal_db_instance_localtime_extended_get_count_with_query,
        .replace_record = NULL,
        .replace_records = NULL
 };
 
-static int _cal_db_instance_allday_extended_get_all_records(int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_localtime_extended_get_all_records(int offset, int limit, calendar_list_h* out_list)
 {
        int ret = 0;
        char offsetquery[CAL_DB_SQL_MAX_LEN] = {0};
@@ -81,7 +81,7 @@ static int _cal_db_instance_allday_extended_get_all_records(int offset, int limi
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT * FROM");
-       cal_db_append_string(&query_str, CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       cal_db_append_string(&query_str, CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
        cal_db_append_string(&query_str, limitquery);
        cal_db_append_string(&query_str, offsetquery);
 
@@ -109,7 +109,7 @@ static int _cal_db_instance_allday_extended_get_all_records(int offset, int limi
                        return ret;
                        /* LCOV_EXCL_STOP */
                }
-               _cal_db_instance_allday_extended_get_stmt(stmt, record);
+               _cal_db_instance_localtime_extended_get_stmt(stmt, record);
 
                ret = calendar_list_add(*out_list, record);
                if (CALENDAR_ERROR_NONE != ret) {
@@ -129,7 +129,7 @@ static int _cal_db_instance_allday_extended_get_all_records(int offset, int limi
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_localtime_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -142,7 +142,7 @@ static int _cal_db_instance_allday_extended_get_records_with_query(calendar_quer
 
        que = (cal_query_s *)query;
 
-       table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
 
        /* make filter */
        if (que->filter) {
@@ -256,9 +256,9 @@ static int _cal_db_instance_allday_extended_get_records_with_query(calendar_quer
                }
                if (0 < que->projection_count) {
                        cal_record_set_projection(record, que->projection, que->projection_count, que->property_count);
-                       _cal_db_instance_allday_extended_get_projection_stmt(stmt, que->projection, que->projection_count, record);
+                       _cal_db_instance_localtime_extended_get_projection_stmt(stmt, que->projection, que->projection_count, record);
                } else {
-                       _cal_db_instance_allday_extended_get_stmt(stmt, record);
+                       _cal_db_instance_localtime_extended_get_stmt(stmt, record);
                }
 
                ret = calendar_list_add(*out_list, record);
@@ -290,13 +290,13 @@ static int _cal_db_instance_allday_extended_get_records_with_query(calendar_quer
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_extended_get_count(int *out_count)
+static int _cal_db_instance_localtime_extended_get_count(int *out_count)
 {
        RETV_IF(NULL == out_count, CALENDAR_ERROR_INVALID_PARAMETER);
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT count(*) FROM");
-       cal_db_append_string(&query_str, CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       cal_db_append_string(&query_str, CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
 
        int ret = 0;
        int count = 0;
@@ -315,7 +315,7 @@ static int _cal_db_instance_allday_extended_get_count(int *out_count)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_allday_extended_get_count_with_query(calendar_query_h query, int *out_count)
+static int _cal_db_instance_localtime_extended_get_count_with_query(calendar_query_h query, int *out_count)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -326,7 +326,7 @@ static int _cal_db_instance_allday_extended_get_count_with_query(calendar_query_
 
        que = (cal_query_s *)query;
 
-       table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
 
        /* make filter */
        if (que->filter) {
@@ -379,9 +379,9 @@ static int _cal_db_instance_allday_extended_get_count_with_query(calendar_query_
        return CALENDAR_ERROR_NONE;
 }
 
-static void _cal_db_instance_allday_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
+static void _cal_db_instance_localtime_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
 {
-       cal_instance_allday_extended_s* instance =  (cal_instance_allday_extended_s*)(record);
+       cal_instance_localtime_extended_s* instance =  (cal_instance_localtime_extended_s*)(record);
        const unsigned char *temp;
        int count = 0;
 
@@ -460,14 +460,14 @@ static void _cal_db_instance_allday_extended_get_stmt(sqlite3_stmt *stmt, calend
        return;
 }
 
-static void _cal_db_instance_allday_extended_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_extended_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record)
 {
-       cal_instance_allday_extended_s* instance =  (cal_instance_allday_extended_s*)(record);
+       cal_instance_localtime_extended_s* instance =  (cal_instance_localtime_extended_s*)(record);
        const unsigned char *temp;
 
        switch (property) {
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_START:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_START:
                instance->start.type = CALENDAR_TIME_LOCALTIME;
                *stmt_count = *stmt_count+1; /* utime */
                *stmt_count = *stmt_count+1;
@@ -479,7 +479,7 @@ static void _cal_db_instance_allday_extended_get_property_stmt(sqlite3_stmt *stm
                                        &(instance->start.time.date.second));
                }
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_END:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_END:
                instance->end.type = CALENDAR_TIME_LOCALTIME;
                *stmt_count = *stmt_count+1; /* utime */
                *stmt_count = *stmt_count+1;
@@ -491,85 +491,85 @@ static void _cal_db_instance_allday_extended_get_property_stmt(sqlite3_stmt *stm
                                        &(instance->end.time.date.second));
                }
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SUMMARY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SUMMARY:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->summary = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LOCATION:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LOCATION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->location = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CALENDAR_ID:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BOOK_ID:
                instance->calendar_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_DESCRIPTION:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_DESCRIPTION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->description = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_BUSY_STATUS:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_BUSY_STATUS:
                instance->busy_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_STATUS:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_STATUS:
                instance->event_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_PRIORITY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_PRIORITY:
                instance->priority = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SENSITIVITY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SENSITIVITY:
                instance->sensitivity = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_RRULE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_RRULE:
                instance->has_rrule = sqlite3_column_int(stmt, *stmt_count);
                if (0 < instance->has_rrule)
                        instance->has_rrule = 1;
 
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LATITUDE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LATITUDE:
                instance->latitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LONGITUDE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LONGITUDE:
                instance->longitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_EVENT_ID:
                instance->event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ALARM:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ALARM:
                instance->has_alarm = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORIGINAL_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORIGINAL_EVENT_ID:
                instance->original_event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_LAST_MODIFIED_TIME:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_LAST_MODIFIED_TIME:
                instance->last_mod = sqlite3_column_int64(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA1:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA1:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_ORGANIZER_NAME:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_ORGANIZER_NAME:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->organizer_name = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_CATEGORIES:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_CATEGORIES:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->categories = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_HAS_ATTENDEE:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_HAS_ATTENDEE:
                instance->has_attendee = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA2:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA2:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data2 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA3:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA3:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data3 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_SYNC_DATA4:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_SYNC_DATA4:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data4 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_ALLDAY_EXTENDED_IS_ALLDAY:
+       case CAL_PROPERTY_INSTANCE_LOCALTIME_EXTENDED_IS_ALLDAY:
                instance->is_allday = sqlite3_column_int(stmt, *stmt_count);
                break;
 
@@ -583,7 +583,7 @@ static void _cal_db_instance_allday_extended_get_property_stmt(sqlite3_stmt *stm
        return;
 }
 
-static void _cal_db_instance_allday_extended_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_localtime_extended_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record)
 {
@@ -591,5 +591,5 @@ static void _cal_db_instance_allday_extended_get_projection_stmt(sqlite3_stmt *s
        int stmt_count = 0;
 
        for (i = 0; i < projection_count; i++)
-               _cal_db_instance_allday_extended_get_property_stmt(stmt, projection[i], &stmt_count, record);
+               _cal_db_instance_localtime_extended_get_property_stmt(stmt, projection[i], &stmt_count, record);
 }
similarity index 79%
rename from server/db/cal_db_plugin_instance_normal.c
rename to server/db/cal_db_plugin_instance_utime.c
index 79a5b0e..c72a2c9 100644 (file)
 #include "cal_access_control.h"
 #include "cal_utils.h"
 
-static int _cal_db_instance_normal_delete_record(int id);
-static int _cal_db_instance_normal_get_all_records(int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_normal_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_normal_get_count(int *out_count);
-static int _cal_db_instance_normal_get_count_with_query(calendar_query_h query, int *out_count);
+static int _cal_db_instance_utime_delete_record(int id);
+static int _cal_db_instance_utime_get_all_records(int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_utime_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_utime_get_count(int *out_count);
+static int _cal_db_instance_utime_get_count_with_query(calendar_query_h query, int *out_count);
 
 /*
  * static function
  */
-static void _cal_db_instance_normal_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
-static void _cal_db_instance_normal_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
+static void _cal_db_instance_utime_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record);
-static void _cal_db_instance_normal_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record);
 
-cal_db_plugin_cb_s cal_db_instance_normal_plugin_cb = {
+cal_db_plugin_cb_s cal_db_instance_utime_plugin_cb = {
        .is_query_only = false,
        .insert_record = NULL,
        .get_record = NULL,
        .update_record = NULL,
-       .delete_record = _cal_db_instance_normal_delete_record,
-       .get_all_records = _cal_db_instance_normal_get_all_records,
-       .get_records_with_query = _cal_db_instance_normal_get_records_with_query,
+       .delete_record = _cal_db_instance_utime_delete_record,
+       .get_all_records = _cal_db_instance_utime_get_all_records,
+       .get_records_with_query = _cal_db_instance_utime_get_records_with_query,
        .insert_records = NULL,
        .update_records = NULL,
        .delete_records = NULL,
-       .get_count = _cal_db_instance_normal_get_count,
-       .get_count_with_query = _cal_db_instance_normal_get_count_with_query,
+       .get_count = _cal_db_instance_utime_get_count,
+       .get_count_with_query = _cal_db_instance_utime_get_count_with_query,
        .replace_record = NULL,
        .replace_records = NULL
 };
 
-static int _cal_db_instance_normal_delete_record(int id)
+static int _cal_db_instance_utime_delete_record(int id)
 {
        int ret = 0;
        char query[CAL_DB_SQL_MAX_LEN] = {0};
@@ -74,7 +74,7 @@ static int _cal_db_instance_normal_delete_record(int id)
        snprintf(query, sizeof(query),
                        "DELETE FROM %s "
                        "WHERE event_id = %d ",
-                       CAL_TABLE_NORMAL_INSTANCE,
+                       CAL_TABLE_UTIME_INSTANCE,
                        id);
 
        ret = cal_db_util_query_exec(query);
@@ -89,7 +89,7 @@ static int _cal_db_instance_normal_delete_record(int id)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_get_all_records(int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_utime_get_all_records(int offset, int limit, calendar_list_h* out_list)
 {
        int ret = CALENDAR_ERROR_NONE;
        char offsetquery[CAL_DB_SQL_MAX_LEN] = {0};
@@ -108,7 +108,7 @@ static int _cal_db_instance_normal_get_all_records(int offset, int limit, calend
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT * FROM");
-       cal_db_append_string(&query_str, CAL_VIEW_TABLE_NORMAL_INSTANCE);
+       cal_db_append_string(&query_str, CAL_VIEW_TABLE_UTIME_INSTANCE);
        cal_db_append_string(&query_str, limitquery);
        cal_db_append_string(&query_str, offsetquery);
 
@@ -137,7 +137,7 @@ static int _cal_db_instance_normal_get_all_records(int offset, int limit, calend
                        return ret;
                        /* LCOV_EXCL_STOP */
                }
-               _cal_db_instance_normal_get_stmt(stmt, record);
+               _cal_db_instance_utime_get_stmt(stmt, record);
 
                ret = calendar_list_add(*out_list, record);
                if (CALENDAR_ERROR_NONE != ret) {
@@ -157,7 +157,7 @@ static int _cal_db_instance_normal_get_all_records(int offset, int limit, calend
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_utime_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -170,10 +170,10 @@ static int _cal_db_instance_normal_get_records_with_query(calendar_query_h query
 
        que = (cal_query_s *)query;
 
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -294,11 +294,11 @@ static int _cal_db_instance_normal_get_records_with_query(calendar_query_h query
                        cal_record_set_projection(record,
                                        que->projection, que->projection_count, que->property_count);
 
-                       _cal_db_instance_normal_get_projection_stmt(stmt,
+                       _cal_db_instance_utime_get_projection_stmt(stmt,
                                        que->projection, que->projection_count,
                                        record);
                } else {
-                       _cal_db_instance_normal_get_stmt(stmt, record);
+                       _cal_db_instance_utime_get_stmt(stmt, record);
                }
 
                ret = calendar_list_add(*out_list, record);
@@ -329,13 +329,13 @@ static int _cal_db_instance_normal_get_records_with_query(calendar_query_h query
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_get_count(int *out_count)
+static int _cal_db_instance_utime_get_count(int *out_count)
 {
        RETV_IF(NULL == out_count, CALENDAR_ERROR_INVALID_PARAMETER);
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT count(*) FROM");
-       cal_db_append_string(&query_str, CAL_TABLE_NORMAL_INSTANCE);
+       cal_db_append_string(&query_str, CAL_TABLE_UTIME_INSTANCE);
 
        int ret = 0;
        int count = 0;
@@ -353,7 +353,7 @@ static int _cal_db_instance_normal_get_count(int *out_count)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_get_count_with_query(calendar_query_h query, int *out_count)
+static int _cal_db_instance_utime_get_count_with_query(calendar_query_h query, int *out_count)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -364,10 +364,10 @@ static int _cal_db_instance_normal_get_count_with_query(calendar_query_h query,
 
        que = (cal_query_s *)query;
 
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -427,9 +427,9 @@ static int _cal_db_instance_normal_get_count_with_query(calendar_query_h query,
        return CALENDAR_ERROR_NONE;
 }
 
-static void _cal_db_instance_normal_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
+static void _cal_db_instance_utime_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
 {
-       cal_instance_normal_s* instance =  (cal_instance_normal_s*)(record);
+       cal_instance_utime_s* instance =  (cal_instance_utime_s*)(record);
        const unsigned char *temp;
        int count = 0;
 
@@ -475,78 +475,78 @@ static void _cal_db_instance_normal_get_stmt(sqlite3_stmt *stmt, calendar_record
        return;
 }
 
-static void _cal_db_instance_normal_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record)
 {
-       cal_instance_normal_s* instance =  (cal_instance_normal_s*)(record);
+       cal_instance_utime_s* instance =  (cal_instance_utime_s*)(record);
        const unsigned char *temp;
 
        switch (property) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_START:
+       case CAL_PROPERTY_INSTANCE_UTIME_START:
                instance->start.type = CALENDAR_TIME_UTIME;
                *stmt_count = *stmt_count+1;
                instance->start.time.utime = sqlite3_column_int64(stmt, *stmt_count);
                *stmt_count = *stmt_count+1; /* datatime */
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_END:
+       case CAL_PROPERTY_INSTANCE_UTIME_END:
                instance->end.type = CALENDAR_TIME_UTIME;
                sqlite3_column_int(stmt, *stmt_count);
                *stmt_count = *stmt_count+1;
                instance->end.time.utime = sqlite3_column_int64(stmt, *stmt_count);
                *stmt_count = *stmt_count+1; /* datatime */
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SUMMARY:
+       case CAL_PROPERTY_INSTANCE_UTIME_SUMMARY:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->summary = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LOCATION:
+       case CAL_PROPERTY_INSTANCE_UTIME_LOCATION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->location = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_CALENDAR_ID:
+       case CAL_PROPERTY_INSTANCE_UTIME_BOOK_ID:
                instance->calendar_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_DESCRIPTION:
+       case CAL_PROPERTY_INSTANCE_UTIME_DESCRIPTION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->description = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_BUSY_STATUS:
+       case CAL_PROPERTY_INSTANCE_UTIME_BUSY_STATUS:
                instance->busy_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EVENT_STATUS:
+       case CAL_PROPERTY_INSTANCE_UTIME_EVENT_STATUS:
                instance->event_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_PRIORITY:
+       case CAL_PROPERTY_INSTANCE_UTIME_PRIORITY:
                instance->priority = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SENSITIVITY:
+       case CAL_PROPERTY_INSTANCE_UTIME_SENSITIVITY:
                instance->sensitivity = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_HAS_RRULE:
+       case CAL_PROPERTY_INSTANCE_UTIME_HAS_RRULE:
                instance->has_rrule = sqlite3_column_int(stmt, *stmt_count);
                if (0 < instance->has_rrule)
                        instance->has_rrule = 1;
 
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LATITUDE:
+       case CAL_PROPERTY_INSTANCE_UTIME_LATITUDE:
                instance->latitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LONGITUDE:
+       case CAL_PROPERTY_INSTANCE_UTIME_LONGITUDE:
                instance->longitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_UTIME_EVENT_ID:
                instance->event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_HAS_ALARM:
+       case CAL_PROPERTY_INSTANCE_UTIME_HAS_ALARM:
                instance->has_alarm = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_ORIGINAL_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_UTIME_ORIGINAL_EVENT_ID:
                instance->original_event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_LAST_MODIFIED_TIME:
+       case CAL_PROPERTY_INSTANCE_UTIME_LAST_MODIFIED_TIME:
                instance->last_mod = sqlite3_column_int64(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_SYNC_DATA1:
+       case CAL_PROPERTY_INSTANCE_UTIME_SYNC_DATA1:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data1 = cal_strdup((const char*)temp);
                break;
@@ -560,7 +560,7 @@ static void _cal_db_instance_normal_get_property_stmt(sqlite3_stmt *stmt,
        return;
 }
 
-static void _cal_db_instance_normal_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record)
 {
@@ -568,5 +568,5 @@ static void _cal_db_instance_normal_get_projection_stmt(sqlite3_stmt *stmt,
        int stmt_count = 0;
 
        for (i = 0; i < projection_count; i++)
-               _cal_db_instance_normal_get_property_stmt(stmt, projection[i], &stmt_count, record);
+               _cal_db_instance_utime_get_property_stmt(stmt, projection[i], &stmt_count, record);
 }
 #include "cal_access_control.h"
 #include "cal_utils.h"
 
-static int _cal_db_instance_normal_extended_get_all_records(int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_normal_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
-static int _cal_db_instance_normal_extended_get_count(int *out_count);
-static int _cal_db_instance_normal_extended_get_count_with_query(calendar_query_h query, int *out_count);
+static int _cal_db_instance_utime_extended_get_all_records(int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_utime_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list);
+static int _cal_db_instance_utime_extended_get_count(int *out_count);
+static int _cal_db_instance_utime_extended_get_count_with_query(calendar_query_h query, int *out_count);
 /*
  * static function
  */
-static void _cal_db_instance_normal_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
-static void _cal_db_instance_normal_extended_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record);
+static void _cal_db_instance_utime_extended_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record);
-static void _cal_db_instance_normal_extended_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_extended_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record);
 
-cal_db_plugin_cb_s cal_db_instance_normal_extended_plugin_cb = {
+cal_db_plugin_cb_s cal_db_instance_utime_extended_plugin_cb = {
        .is_query_only = false,
        .insert_record = NULL,
        .get_record = NULL,
        .update_record = NULL,
        .delete_record = NULL,
-       .get_all_records = _cal_db_instance_normal_extended_get_all_records,
-       .get_records_with_query = _cal_db_instance_normal_extended_get_records_with_query,
+       .get_all_records = _cal_db_instance_utime_extended_get_all_records,
+       .get_records_with_query = _cal_db_instance_utime_extended_get_records_with_query,
        .insert_records = NULL,
        .update_records = NULL,
        .delete_records = NULL,
-       .get_count = _cal_db_instance_normal_extended_get_count,
-       .get_count_with_query = _cal_db_instance_normal_extended_get_count_with_query,
+       .get_count = _cal_db_instance_utime_extended_get_count,
+       .get_count_with_query = _cal_db_instance_utime_extended_get_count_with_query,
        .replace_record = NULL,
        .replace_records = NULL
 };
 
-static int _cal_db_instance_normal_extended_get_all_records(int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_utime_extended_get_all_records(int offset, int limit, calendar_list_h* out_list)
 {
        int ret = CALENDAR_ERROR_NONE;
        char offsetquery[CAL_DB_SQL_MAX_LEN] = {0};
@@ -80,7 +80,7 @@ static int _cal_db_instance_normal_extended_get_all_records(int offset, int limi
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT * FROM");
-       cal_db_append_string(&query_str, CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
+       cal_db_append_string(&query_str, CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
        cal_db_append_string(&query_str, limitquery);
        cal_db_append_string(&query_str, offsetquery);
 
@@ -108,7 +108,7 @@ static int _cal_db_instance_normal_extended_get_all_records(int offset, int limi
                        return ret;
                        /* LCOV_EXCL_STOP */
                }
-               _cal_db_instance_normal_extended_get_stmt(stmt, record);
+               _cal_db_instance_utime_extended_get_stmt(stmt, record);
 
                ret = calendar_list_add(*out_list, record);
                if (CALENDAR_ERROR_NONE != ret) {
@@ -128,7 +128,7 @@ static int _cal_db_instance_normal_extended_get_all_records(int offset, int limi
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
+static int _cal_db_instance_utime_extended_get_records_with_query(calendar_query_h query, int offset, int limit, calendar_list_h* out_list)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -141,7 +141,7 @@ static int _cal_db_instance_normal_extended_get_records_with_query(calendar_quer
 
        que = (cal_query_s *)query;
 
-       table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
+       table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
 
        /* make filter */
        if (que->filter) {
@@ -257,10 +257,10 @@ static int _cal_db_instance_normal_extended_get_records_with_query(calendar_quer
                        cal_record_set_projection(record,
                                        que->projection, que->projection_count, que->property_count);
 
-                       _cal_db_instance_normal_extended_get_projection_stmt(stmt,
+                       _cal_db_instance_utime_extended_get_projection_stmt(stmt,
                                        que->projection, que->projection_count, record);
                } else {
-                       _cal_db_instance_normal_extended_get_stmt(stmt, record);
+                       _cal_db_instance_utime_extended_get_stmt(stmt, record);
                }
 
                ret = calendar_list_add(*out_list, record);
@@ -291,13 +291,13 @@ static int _cal_db_instance_normal_extended_get_records_with_query(calendar_quer
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_extended_get_count(int *out_count)
+static int _cal_db_instance_utime_extended_get_count(int *out_count)
 {
        RETV_IF(NULL == out_count, CALENDAR_ERROR_INVALID_PARAMETER);
 
        char *query_str = NULL;
        cal_db_append_string(&query_str, "SELECT count(*) FROM");
-       cal_db_append_string(&query_str, CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
+       cal_db_append_string(&query_str, CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
 
        int ret = 0;
        int count = 0;
@@ -316,7 +316,7 @@ static int _cal_db_instance_normal_extended_get_count(int *out_count)
        return CALENDAR_ERROR_NONE;
 }
 
-static int _cal_db_instance_normal_extended_get_count_with_query(calendar_query_h query, int *out_count)
+static int _cal_db_instance_utime_extended_get_count_with_query(calendar_query_h query, int *out_count)
 {
        cal_query_s *que = NULL;
        int ret = CALENDAR_ERROR_NONE;
@@ -326,7 +326,7 @@ static int _cal_db_instance_normal_extended_get_count_with_query(calendar_query_
        GSList *bind_text = NULL;
 
        que = (cal_query_s *)query;
-       table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
+       table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
 
        /* make filter */
        if (que->filter) {
@@ -380,9 +380,9 @@ static int _cal_db_instance_normal_extended_get_count_with_query(calendar_query_
        return CALENDAR_ERROR_NONE;
 }
 
-static void _cal_db_instance_normal_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
+static void _cal_db_instance_utime_extended_get_stmt(sqlite3_stmt *stmt, calendar_record_h record)
 {
-       cal_instance_normal_extended_s* instance =  (cal_instance_normal_extended_s*)(record);
+       cal_instance_utime_extended_s* instance =  (cal_instance_utime_extended_s*)(record);
        const unsigned char *temp;
        int count = 0;
 
@@ -445,102 +445,102 @@ static void _cal_db_instance_normal_extended_get_stmt(sqlite3_stmt *stmt, calend
        return;
 }
 
-static void _cal_db_instance_normal_extended_get_property_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_extended_get_property_stmt(sqlite3_stmt *stmt,
                unsigned int property, int *stmt_count, calendar_record_h record)
 {
-       cal_instance_normal_extended_s* instance =  (cal_instance_normal_extended_s*)(record);
+       cal_instance_utime_extended_s* instance =  (cal_instance_utime_extended_s*)(record);
        const unsigned char *temp;
 
        switch (property) {
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_START:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_START:
                instance->start.type = CALENDAR_TIME_UTIME;
                *stmt_count = *stmt_count+1;
                instance->start.time.utime = sqlite3_column_int64(stmt, *stmt_count);
                *stmt_count = *stmt_count+1;
                *stmt_count = *stmt_count+1;
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_END:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_END:
                instance->end.type = CALENDAR_TIME_UTIME;
                *stmt_count = *stmt_count+1;
                instance->end.time.utime = sqlite3_column_int64(stmt, *stmt_count);
                *stmt_count = *stmt_count+1;
                *stmt_count = *stmt_count+1;
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SUMMARY:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SUMMARY:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->summary = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LOCATION:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LOCATION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->location = cal_strdup((const char*)temp);
                break;
-       case  CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CALENDAR_ID:
+       case  CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BOOK_ID:
                instance->calendar_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_DESCRIPTION:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_DESCRIPTION:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->description = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_BUSY_STATUS:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_BUSY_STATUS:
                instance->busy_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_STATUS:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_STATUS:
                instance->event_status = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_PRIORITY:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_PRIORITY:
                instance->priority = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SENSITIVITY:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SENSITIVITY:
                instance->sensitivity = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_RRULE:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_RRULE:
                instance->has_rrule = sqlite3_column_int(stmt, *stmt_count);
                if (0 < instance->has_rrule)
                        instance->has_rrule = 1;
 
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LATITUDE:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LATITUDE:
                instance->latitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LONGITUDE:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LONGITUDE:
                instance->longitude = sqlite3_column_double(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_EVENT_ID:
                instance->event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ALARM:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ALARM:
                instance->has_alarm = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORIGINAL_EVENT_ID:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORIGINAL_EVENT_ID:
                instance->original_event_id = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_LAST_MODIFIED_TIME:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_LAST_MODIFIED_TIME:
                instance->last_mod = sqlite3_column_int64(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA1:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA1:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data1 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_ORGANIZER_NAME:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_ORGANIZER_NAME:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->organizer_name = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_CATEGORIES:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_CATEGORIES:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->categories = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_HAS_ATTENDEE:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_HAS_ATTENDEE:
                instance->has_attendee = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA2:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA2:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data2 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA3:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA3:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data3 = cal_strdup((const char*)temp);
                break;
-       case CAL_PROPERTY_INSTANCE_NORMAL_EXTENDED_SYNC_DATA4:
+       case CAL_PROPERTY_INSTANCE_UTIME_EXTENDED_SYNC_DATA4:
                temp = sqlite3_column_text(stmt, *stmt_count);
                instance->sync_data4 = cal_strdup((const char*)temp);
                break;
@@ -554,7 +554,7 @@ static void _cal_db_instance_normal_extended_get_property_stmt(sqlite3_stmt *stm
        return;
 }
 
-static void _cal_db_instance_normal_extended_get_projection_stmt(sqlite3_stmt *stmt,
+static void _cal_db_instance_utime_extended_get_projection_stmt(sqlite3_stmt *stmt,
                const unsigned int *projection, const int projection_count,
                calendar_record_h record)
 {
@@ -562,5 +562,5 @@ static void _cal_db_instance_normal_extended_get_projection_stmt(sqlite3_stmt *s
        int stmt_count = 0;
 
        for (i = 0; i < projection_count; i++)
-               _cal_db_instance_normal_extended_get_property_stmt(stmt, projection[i], &stmt_count, record);
+               _cal_db_instance_utime_extended_get_property_stmt(stmt, projection[i], &stmt_count, record);
 }
index 32a83e6..a6fa19a 100644 (file)
@@ -92,20 +92,20 @@ static int _cal_db_search_get_records_with_query(calendar_query_h query, int off
                _cal_db_search_make_projection(query, &projection);
 
        /* query - projection */
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR)) {
-               table_name = strdup(CAL_VIEW_TABLE_EVENT_CALENDAR);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_CALENDAR)) {
-               table_name = strdup(CAL_VIEW_TABLE_TODO_CALENDAR);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE)) {
-               table_name = strdup(CAL_VIEW_TABLE_EVENT_CALENDAR_ATTENDEE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR)) {
-               table_name = strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR_EXTENDED)) {
-               table_name = strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE_EXTENDED);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR)) {
-               table_name = strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR_EXTENDED)) {
-               table_name = strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE_EXTENDED);
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK)) {
+               table_name = strdup(CAL_VIEW_TABLE_EVENT_BOOK);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_BOOK)) {
+               table_name = strdup(CAL_VIEW_TABLE_TODO_BOOK);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK_ATTENDEE)) {
+               table_name = strdup(CAL_VIEW_TABLE_EVENT_BOOK_ATTENDEE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK)) {
+               table_name = strdup(CAL_VIEW_TABLE_UTIME_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK_EXTENDED)) {
+               table_name = strdup(CAL_VIEW_TABLE_UTIME_INSTANCE_EXTENDED);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK)) {
+               table_name = strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK_EXTENDED)) {
+               table_name = strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE_EXTENDED);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -258,20 +258,20 @@ static int _cal_db_search_get_count_with_query(calendar_query_h query, int *out_
 
        que = (cal_query_s *)query;
 
-       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_CALENDAR);
+       if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_BOOK);
                projection = cal_strdup("id");
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_TODO_CALENDAR);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_TODO_BOOK);
                projection = cal_strdup("id");
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_CALENDAR_ATTENDEE)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_CALENDAR_ATTENDEE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_EVENT_BOOK_ATTENDEE)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_EVENT_BOOK_ATTENDEE);
                projection = cal_strdup("id");
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_NORMAL_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_UTIME_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_UTIME_INSTANCE);
                projection = cal_strdup("event_id");
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_ALLDAY_INSTANCE);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_INSTANCE_LOCALTIME_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_LOCALTIME_INSTANCE);
                projection = cal_strdup("event_id");
        } else {
                /* LCOV_EXCL_START */
index f65deca..f650a31 100644 (file)
@@ -1000,8 +1000,8 @@ static int _cal_db_todo_get_records_with_query(calendar_query_h query, int offse
 
        if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO)) {
                table_name = cal_strdup(CAL_VIEW_TABLE_TODO);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_TODO_CALENDAR);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_TODO_BOOK);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -1236,8 +1236,8 @@ static int _cal_db_todo_get_count_with_query(calendar_query_h query, int *out_co
 
        if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO)) {
                table_name = cal_strdup(CAL_VIEW_TABLE_TODO);
-       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_CALENDAR)) {
-               table_name = cal_strdup(CAL_VIEW_TABLE_TODO_CALENDAR);
+       } else if (CAL_STRING_EQUAL == strcmp(que->view_uri, CALENDAR_VIEW_TODO_BOOK)) {
+               table_name = cal_strdup(CAL_VIEW_TABLE_TODO_BOOK);
        } else {
                /* LCOV_EXCL_START */
                ERR("uri(%s) not support get records with query", que->view_uri);
@@ -1486,7 +1486,7 @@ static void _cal_db_todo_get_property_stmt(sqlite3_stmt *stmt,
        case CAL_PROPERTY_TODO_ID:
                todo->index = sqlite3_column_int(stmt, *stmt_count);
                break;
-       case CAL_PROPERTY_TODO_CALENDAR_ID:
+       case CAL_PROPERTY_TODO_BOOK_ID:
                todo->calendar_id = sqlite3_column_int(stmt, *stmt_count);
                break;
        case CAL_PROPERTY_TODO_SUMMARY:
index 919a967..565da1b 100644 (file)
@@ -152,12 +152,12 @@ int cal_db_query_create_order(calendar_query_h query, char *condition, char **or
                if (p_utime && p_datetime) {
                        cal_record_type_e type = cal_view_get_type(query_s->view_uri);
                        switch (type) {
-                       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-                       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
+                       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+                       case CAL_RECORD_TYPE_INSTANCE_UTIME:
                                snprintf(out_order, sizeof(out_order), "ORDER BY %s %s ", p_utime, query_s->asc == false ? "DESC" : "ASC");
                                break;
-                       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-                       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
+                       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+                       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
                                snprintf(out_order, sizeof(out_order), "ORDER BY %s %s ", p_datetime, query_s->asc == false ? "DESC" : "ASC");
                                break;
                        default:
@@ -785,10 +785,10 @@ static int _cal_db_query_create_caltime_condition(cal_composite_filter_s *com_fi
        }
 
        cal_record_type_e record_type = cal_view_get_type(com_filter->view_uri);
-       if (record_type != CAL_RECORD_TYPE_INSTANCE_NORMAL &&
-                       record_type != CAL_RECORD_TYPE_INSTANCE_ALLDAY &&
-                       record_type != CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED &&
-                       record_type != CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED) {
+       if (record_type != CAL_RECORD_TYPE_INSTANCE_UTIME &&
+                       record_type != CAL_RECORD_TYPE_INSTANCE_LOCALTIME &&
+                       record_type != CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED &&
+                       record_type != CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED) {
                int len = strlen(out_cond);
                const char *type_field = _cal_db_query_get_timetype_field_name(field_name);
                snprintf(out_cond + len, sizeof(out_cond) - len -1, " AND %s = %d ", type_field, filter->value.caltime.type);
index 7e7a822..44699f5 100644 (file)
@@ -48,7 +48,7 @@ static TLS bool calendar_change = false;
 
 static void _cal_db_util_notify_event_change(void)
 {
-       int fd = open(CAL_NOTI_EVENT_CHANGED, O_TRUNC | O_RDWR);
+       int fd = open(CAL_NOTI_FILE_EVENT, O_TRUNC | O_RDWR);
        if (0 <= fd) {
                close(fd);
                event_change = false;
@@ -61,7 +61,7 @@ static void _cal_db_util_notify_event_change(void)
 
 static inline void _cal_db_util_notify_todo_change(void)
 {
-       int fd = open(CAL_NOTI_TODO_CHANGED, O_TRUNC | O_RDWR);
+       int fd = open(CAL_NOTI_FILE_TODO, O_TRUNC | O_RDWR);
        if (0 <= fd) {
                close(fd);
                todo_change = false;
@@ -74,7 +74,7 @@ static inline void _cal_db_util_notify_todo_change(void)
 
 static inline void _cal_db_util_notify_calendar_change(void)
 {
-       int fd = open(CAL_NOTI_CALENDAR_CHANGED, O_TRUNC | O_RDWR);
+       int fd = open(CAL_NOTI_FILE_BOOK, O_TRUNC | O_RDWR);
        if (0 <= fd) {
                close(fd);
                calendar_change = false;
@@ -102,7 +102,7 @@ int cal_db_util_notify(cal_noti_type_e type)
                case CAL_NOTI_TYPE_TODO:
                        todo_change = true;
                        break;
-               case CAL_NOTI_TYPE_CALENDAR:
+               case CAL_NOTI_TYPE_BOOK:
                        calendar_change = true;
                        break;
                default:
@@ -121,7 +121,7 @@ int cal_db_util_notify(cal_noti_type_e type)
        case CAL_NOTI_TYPE_TODO:
                _cal_db_util_notify_todo_change();
                break;
-       case CAL_NOTI_TYPE_CALENDAR:
+       case CAL_NOTI_TYPE_BOOK:
                _cal_db_util_notify_calendar_change();
                break;
        default: