modify terminology:calendar->book,allday->localtime,normal->utime,svc->service
[platform/core/pim/calendar-service.git] / common / cal_view.c
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])));
                }
        }