modify terminology:calendar->book,allday->localtime,normal->utime,svc->service

[platform/core/pim/calendar-service.git] / server / db / cal_db_query.c

diff --git a/server/db/cal_db_query.c b/server/db/cal_db_query.c
index 919a967..565da1b 100644 (file)
--- a/server/db/cal_db_query.c
+++ b/server/db/cal_db_query.c
@@ -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);