[Contact] Refactoring API structures

[profile/ivi/wrt-plugins-tizen.git] / src / platform / Tizen / Calendar / CalendarFilterValidator.cpp

diff --git a/src/platform/Tizen/Calendar/CalendarFilterValidator.cpp b/src/platform/Tizen/Calendar/CalendarFilterValidator.cpp
index 2be178c..b2752ff 100755 (executable)
--- a/src/platform/Tizen/Calendar/CalendarFilterValidator.cpp
+++ b/src/platform/Tizen/Calendar/CalendarFilterValidator.cpp
@@ -27,6 +27,7 @@ using namespace TizenApis::Api::Tizen;
 static PropertyStructArray properties =
 {
     {CALENDAR_FILTER_ATTRIBUTE_ID_UID,              PrimitiveType_String},
+    {CALENDAR_FILTER_ATTRIBUTE_ID,                     PrimitiveType_String},
     {CALENDAR_FILTER_ATTRIBUTE_LAST_MODIFIED_DATE,  PrimitiveType_Time},
     {CALENDAR_FILTER_ATTRIBUTE_DESCRIPTION,         PrimitiveType_String},
     {CALENDAR_FILTER_ATTRIBUTE_SUMMARY,             PrimitiveType_String},
@@ -40,26 +41,20 @@ static PropertyStructArray properties =
     {CALENDAR_FILTER_ATTRIBUTE_CATEGORIES,          PrimitiveType_String},
     {CALENDAR_FILTER_ATTRIBUTE_PRIORITY,            PrimitiveType_String},
     {CALENDAR_FILTER_ATTRIBUTE_DUE_DATE,            PrimitiveType_Time},
+       {CALENDAR_FILTER_ATTRIBUTE_IS_DETACHED,                 PrimitiveType_Boolean},
     {CALENDAR_FILTER_ATTRIBUTE_IS_ALL_DAY,          PrimitiveType_Boolean},
     {CALENDAR_FILTER_ATTRIBUTE_END_DATE,            PrimitiveType_Time},
+    {CALENDAR_FILTER_ATTRIBUTE_COMPLETED_DATE,      PrimitiveType_Time},
+    {CALENDAR_FILTER_ATTRIBUTE_PROGRESS,               PrimitiveType_Integer},
     {CALENDAR_FILTER_ATTRIBUTE_AVAILABILITY,        PrimitiveType_String},
-    {0,        PrimitiveType_Notype}
-};
-
-static MatchFlagStrArray matchFlag
-{
-       "EXACTLY",
-       "CONTAINS",
-       "STARTSWITH",
-       "ENDSWITH",
-       "EXISTS",
-       0
+    {CALENDAR_FILTER_ATTRIBUTE_RECURRENCE_RULE,        PrimitiveType_String},
+    {0,        PrimitiveType_NoType}
 };
 
 FilterValidatorPtr CalendarFilterValidatorFactory::getCalendarFilterValidator()
 {
     static FilterValidatorPtr theInstance =
-               FilterValidatorPtr(new FilterValidator(properties, matchFlag));
+               FilterValidatorPtr(new FilterValidator(properties));
     return theInstance;
 }