From: Mu-Woong Date: Mon, 17 Aug 2015 12:57:55 +0000 (+0900) Subject: Sync with Tizen 2.4 X-Git-Tag: submit/tizen_mobile/20150818.030430~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F46175%2F1;p=platform%2Fcore%2Fapi%2Fcontext.git Sync with Tizen 2.4 - Cleanup history/trigger item names Change-Id: I3ffdb0e74a43bfeebef5ef714e6bbd9eb553aded Signed-off-by: Mu-Woong --- diff --git a/include/context_history_types_internal.h b/include/context_history_types_internal.h index e240cf1..57a0a8b 100644 --- a/include/context_history_types_internal.h +++ b/include/context_history_types_internal.h @@ -19,27 +19,27 @@ #include -#define CONTEXT_HISTORY_DATA "QueryResult" +#define CONTEXT_HISTORY_DATA "QueryResult" -#define CONTEXT_HISTORY_SUBJECT_RECENTLY_USED_APP "app/history/recently_used" -#define CONTEXT_HISTORY_SUBJECT_FREQUENTLY_USED_APP "app/history/frequently_used" -#define CONTEXT_HISTORY_SUBJECT_RARELY_USED_APP "app/history/rarely_used" -#define CONTEXT_HISTORY_SUBJECT_PEAK_TIME_FOR_APP "app/history/peak_time" -#define CONTEXT_HISTORY_SUBJECT_PEAK_TIME_FOR_MUSIC "music/history/peak_time" -#define CONTEXT_HISTORY_SUBJECT_PEAK_TIME_FOR_VIDEO "video/history/peak_time" -#define CONTEXT_HISTORY_SUBJECT_COMMON_SETTING_FOR_APP "app/history/common_setting" -#define CONTEXT_HISTORY_SUBJECT_COMMON_SETTING_FOR_MUSIC "music/history/common_setting" -#define CONTEXT_HISTORY_SUBJECT_COMMON_SETTING_FOR_VIDEO "video/history/common_setting" -#define CONTEXT_HISTORY_SUBJECT_FREQUENTLY_COMMUNICATED_ADDRESS "social/history/frequently_communicated" +#define SUBJ_RECENTLY_USED_APP "stats/app/recently" +#define SUBJ_FREQUENTLY_USED_APP "stats/app/often" +#define SUBJ_RARELY_USED_APP "stats/app/rarely" +#define SUBJ_PEAK_TIME_FOR_APP "stats/app/peak_time" +#define SUBJ_PEAK_TIME_FOR_MUSIC "stats/music/peak_time" +#define SUBJ_PEAK_TIME_FOR_VIDEO "stats/video/peak_time" +#define SUBJ_COMMON_SETTING_FOR_APP "stats/app/setting" +#define SUBJ_COMMON_SETTING_FOR_MUSIC "stats/music/setting" +#define SUBJ_COMMON_SETTING_FOR_VIDEO "stats/video/setting" +#define SUBJ_FREQUENTLY_COMMUNICATED_ADDRESS "stats/contact/often" -#define CONTEXT_HISTORY_FILTER_KEY_TIME_SPAN "TimeSpan" -#define CONTEXT_HISTORY_FILTER_KEY_RESULT_SIZE "ResultSize" -#define CONTEXT_HISTORY_FILTER_KEY_APP_ID "AppId" -#define CONTEXT_HISTORY_FILTER_KEY_DAY_OF_WEEK "DayOfWeek" -#define CONTEXT_HISTORY_FILTER_KEY_START_TIME "StartTime" -#define CONTEXT_HISTORY_FILTER_KEY_END_TIME "EndTime" -#define CONTEXT_HISTORY_FILTER_KEY_AUDIO_JACK "AudioJack" -#define CONTEXT_HISTORY_FILTER_KEY_WIFI_BSSID "BSSID" -#define CONTEXT_HISTORY_FILTER_KEY_COMMUNICATION_TYPE "CommunicationType" +#define FILTER_TIME_SPAN "TimeSpan" +#define FILTER_RESULT_SIZE "ResultSize" +#define FILTER_APP_ID "AppId" +#define FILTER_DAY_OF_WEEK "DayOfWeek" +#define FILTER_START_TIME "StartTime" +#define FILTER_END_TIME "EndTime" +#define FILTER_AUDIO_JACK "AudioJack" +#define FILTER_WIFI_BSSID "BSSID" +#define FILTER_COMMUNICATION_TYPE "CommunicationType" #endif /* __TIZEN_CONTEXT_HISTORY_TYPES_INTERNAL_H__ */ diff --git a/include/context_trigger_types_internal.h b/include/context_trigger_types_internal.h index 94e5e0f..5b584b2 100644 --- a/include/context_trigger_types_internal.h +++ b/include/context_trigger_types_internal.h @@ -17,12 +17,12 @@ #ifndef __TIZEN_CONTEXT_CONTEXT_TRIGGER_TYPES_INTERNAL_H__ #define __TIZEN_CONTEXT_CONTEXT_TRIGGER_TYPES_INTERNAL_H__ -#define CONTEXT_TRIGGER_SUBJECT_ADD "context_trigger/add" -#define CONTEXT_TRIGGER_SUBJECT_REMOVE "context_trigger/remove" -#define CONTEXT_TRIGGER_SUBJECT_ENABLE "context_trigger/enable" -#define CONTEXT_TRIGGER_SUBJECT_DISABLE "context_trigger/disable" -#define CONTEXT_TRIGGER_SUBJECT_GET "context_trigger/get" -#define CONTEXT_TRIGGER_SUBJECT_GET_RULE_IDS "context_trigger/get_rule_ids" +#define CONTEXT_TRIGGER_SUBJECT_ADD "trigger/add" +#define CONTEXT_TRIGGER_SUBJECT_REMOVE "trigger/remove" +#define CONTEXT_TRIGGER_SUBJECT_ENABLE "trigger/enable" +#define CONTEXT_TRIGGER_SUBJECT_DISABLE "trigger/disable" +#define CONTEXT_TRIGGER_SUBJECT_GET "trigger/get" +#define CONTEXT_TRIGGER_SUBJECT_GET_RULE_IDS "trigger/get_rule_ids" #define CT_RULE_ARRAY_ENABLED "ARRAY_ENABLED" #define CT_RULE_ARRAY_DISABLED "ARRAY_DISABLED" @@ -63,41 +63,35 @@ #define CT_RESPONSE "RES" -#define CT_EVENT_TIME "timer/event" -#define CT_EVENT_BATTERY "system/state/battery" -#define CT_EVENT_CHARGER "system/state/charger" -#define CT_EVENT_FLIGHT_MODE "system/state/flight_mode" -#define CT_EVENT_GPS "system/state/gps" -#define CT_EVENT_HEADPHONE "system/state/headphone" -#define CT_EVENT_POWER_SAVING_MODE "system/state/ps_mode" -#define CT_EVENT_SILENT_MODE "system/state/silent_mode" -#define CT_EVENT_VIBRATION_MODE "system/state/vibration_mode" -#define CT_EVENT_USB "system/state/usb" -#define CT_EVENT_WIFI "system/state/wifi" -#define CT_EVENT_CALL "social/state/call" -#define CT_EVENT_EMAIL "social/event/email" -#define CT_EVENT_MESSAGE "social/event/message" -#define CT_EVENT_ACTIVITY_STATIONARY "activity/event/stationary" -#define CT_EVENT_ACTIVITY_WALKING "activity/event/walking" -#define CT_EVENT_ACTIVITY_RUNNING "activity/event/running" -#define CT_EVENT_ACTIVITY_IN_VEHICLE "activity/event/in_vehicle" -#define CT_EVENT_PLACE "place/event/geofence" -#define CT_CONDITION_TIME "timer/state" -#define CT_CONDITION_BATTERY "system/state/battery" -#define CT_CONDITION_CHARGER "system/state/charger" -#define CT_CONDITION_FLIGHT_MODE "system/state/flight_mode" -#define CT_CONDITION_GPS "system/state/gps" -#define CT_CONDITION_HEADPHONE "system/state/headphone" -#define CT_CONDITION_POWER_SAVING_MODE "system/state/ps_mode" -#define CT_CONDITION_SILENT_MODE "system/state/silent_mode" -#define CT_CONDITION_VIBRATION_MODE "system/state/vibration_mode" -#define CT_CONDITION_USB "system/state/usb" -#define CT_CONDITION_WIFI "system/state/wifi" -#define CT_CONDITION_CALL "social/state/call" -#define CT_CONDITION_APP_USE_FREQUENCY "app/history/use_freq" -#define CT_CONDITION_COMMUNICATION_FREQUENCY "contact/history/comm_freq" -#define CT_CONDITION_MUSIC_PLAYBACK_FREQUENCY "music/history/play_freq" -#define CT_CONDITION_VIDEO_PLAYBACK_FREQUENCY "video/history/play_freq" +#define CT_EVENT_TIME "time/alarm" +#define CT_EVENT_BATTERY "system/battery" +#define CT_EVENT_CHARGER "system/charger" +#define CT_EVENT_GPS "system/gps" +#define CT_EVENT_HEADPHONE "system/headphone" +#define CT_EVENT_POWER_SAVING_MODE "system/psmode" +#define CT_EVENT_USB "system/usb" +#define CT_EVENT_WIFI "system/wifi" +#define CT_EVENT_CALL "social/call" +#define CT_EVENT_EMAIL "social/email" +#define CT_EVENT_MESSAGE "social/message" +#define CT_EVENT_ACTIVITY_STATIONARY "activity/stationary" +#define CT_EVENT_ACTIVITY_WALKING "activity/walking" +#define CT_EVENT_ACTIVITY_RUNNING "activity/running" +#define CT_EVENT_ACTIVITY_IN_VEHICLE "activity/in_vehicle" +#define CT_EVENT_PLACE "place/geofence" +#define CT_CONDITION_TIME "time/now" +#define CT_CONDITION_BATTERY "system/battery" +#define CT_CONDITION_CHARGER "system/charger" +#define CT_CONDITION_GPS "system/gps" +#define CT_CONDITION_HEADPHONE "system/headphone" +#define CT_CONDITION_POWER_SAVING_MODE "system/psmode" +#define CT_CONDITION_USB "system/usb" +#define CT_CONDITION_WIFI "system/wifi" +#define CT_CONDITION_CALL "social/call" +#define CT_CONDITION_APP_USE_FREQUENCY "stats/app/frequency" +#define CT_CONDITION_COMMUNICATION_FREQUENCY "stats/contact/frequency" +#define CT_CONDITION_MUSIC_PLAYBACK_FREQUENCY "stats/music/frequency" +#define CT_CONDITION_VIDEO_PLAYBACK_FREQUENCY "stats/video/frequency" #define TYPE_EVENT 1 #define TYPE_CONDITION 2 diff --git a/src/context_history.cpp b/src/context_history.cpp index 41f986d..8e3d99c 100644 --- a/src/context_history.cpp +++ b/src/context_history.cpp @@ -282,31 +282,31 @@ std::string convert_filter_to_string(context_history_filter_e filter_type) std::string str; switch (filter_type) { case CONTEXT_HISTORY_FILTER_TIME_SPAN: - str = CONTEXT_HISTORY_FILTER_KEY_TIME_SPAN; + str = FILTER_TIME_SPAN; break; case CONTEXT_HISTORY_FILTER_RESULT_SIZE: - str = CONTEXT_HISTORY_FILTER_KEY_RESULT_SIZE; + str = FILTER_RESULT_SIZE; break; case CONTEXT_HISTORY_FILTER_APP_ID: - str = CONTEXT_HISTORY_FILTER_KEY_APP_ID; + str = FILTER_APP_ID; break; case CONTEXT_HISTORY_FILTER_DAY_OF_WEEK: - str = CONTEXT_HISTORY_FILTER_KEY_DAY_OF_WEEK; + str = FILTER_DAY_OF_WEEK; break; case CONTEXT_HISTORY_FILTER_START_TIME: - str = CONTEXT_HISTORY_FILTER_KEY_START_TIME; + str = FILTER_START_TIME; break; case CONTEXT_HISTORY_FILTER_END_TIME: - str = CONTEXT_HISTORY_FILTER_KEY_END_TIME; + str = FILTER_END_TIME; break; case CONTEXT_HISTORY_FILTER_WIFI_BSSID: - str = CONTEXT_HISTORY_FILTER_KEY_WIFI_BSSID; + str = FILTER_WIFI_BSSID; break; case CONTEXT_HISTORY_FILTER_AUDIO_JACK: - str = CONTEXT_HISTORY_FILTER_KEY_AUDIO_JACK; + str = FILTER_AUDIO_JACK; break; case CONTEXT_HISTORY_FILTER_COMMUNICATION_TYPE: - str = CONTEXT_HISTORY_FILTER_KEY_COMMUNICATION_TYPE; + str = FILTER_COMMUNICATION_TYPE; break; default: break; @@ -319,34 +319,34 @@ std::string convert_data_to_string(context_history_data_e data_type) std::string str; switch (data_type) { case CONTEXT_HISTORY_RECENTLY_USED_APP: - str = CONTEXT_HISTORY_SUBJECT_RECENTLY_USED_APP; + str = SUBJ_RECENTLY_USED_APP; break; case CONTEXT_HISTORY_FREQUENTLY_USED_APP: - str = CONTEXT_HISTORY_SUBJECT_FREQUENTLY_USED_APP; + str = SUBJ_FREQUENTLY_USED_APP; break; case CONTEXT_HISTORY_RARELY_USED_APP: - str = CONTEXT_HISTORY_SUBJECT_RARELY_USED_APP; + str = SUBJ_RARELY_USED_APP; break; case CONTEXT_HISTORY_PEAK_TIME_FOR_APP: - str = CONTEXT_HISTORY_SUBJECT_PEAK_TIME_FOR_APP; + str = SUBJ_PEAK_TIME_FOR_APP; break; case CONTEXT_HISTORY_PEAK_TIME_FOR_MUSIC: - str = CONTEXT_HISTORY_SUBJECT_PEAK_TIME_FOR_MUSIC; + str = SUBJ_PEAK_TIME_FOR_MUSIC; break; case CONTEXT_HISTORY_PEAK_TIME_FOR_VIDEO: - str = CONTEXT_HISTORY_SUBJECT_PEAK_TIME_FOR_VIDEO; + str = SUBJ_PEAK_TIME_FOR_VIDEO; break; case CONTEXT_HISTORY_COMMON_SETTING_FOR_APP: - str = CONTEXT_HISTORY_SUBJECT_COMMON_SETTING_FOR_APP; + str = SUBJ_COMMON_SETTING_FOR_APP; break; case CONTEXT_HISTORY_COMMON_SETTING_FOR_MUSIC: - str = CONTEXT_HISTORY_SUBJECT_COMMON_SETTING_FOR_MUSIC; + str = SUBJ_COMMON_SETTING_FOR_MUSIC; break; case CONTEXT_HISTORY_COMMON_SETTING_FOR_VIDEO: - str = CONTEXT_HISTORY_SUBJECT_COMMON_SETTING_FOR_VIDEO; + str = SUBJ_COMMON_SETTING_FOR_VIDEO; break; case CONTEXT_HISTORY_FREQUENTLY_COMMUNICATED_ADDRESS: - str = CONTEXT_HISTORY_SUBJECT_FREQUENTLY_COMMUNICATED_ADDRESS; + str = SUBJ_FREQUENTLY_COMMUNICATED_ADDRESS; break; default: break; @@ -426,15 +426,15 @@ bool check_invalid_filter(context_history_data_e data_type, context_history_filt /* This should be aligned with context_history_filter_e */ static const char *filter_key[FILTER_KEY_LIMIT] = { NULL, - CONTEXT_HISTORY_FILTER_KEY_TIME_SPAN, - CONTEXT_HISTORY_FILTER_KEY_RESULT_SIZE, - CONTEXT_HISTORY_FILTER_KEY_APP_ID, - CONTEXT_HISTORY_FILTER_KEY_DAY_OF_WEEK, - CONTEXT_HISTORY_FILTER_KEY_START_TIME, - CONTEXT_HISTORY_FILTER_KEY_END_TIME, - CONTEXT_HISTORY_FILTER_KEY_WIFI_BSSID, - CONTEXT_HISTORY_FILTER_KEY_AUDIO_JACK, - CONTEXT_HISTORY_FILTER_KEY_COMMUNICATION_TYPE, + FILTER_TIME_SPAN, + FILTER_RESULT_SIZE, + FILTER_APP_ID, + FILTER_DAY_OF_WEEK, + FILTER_START_TIME, + FILTER_END_TIME, + FILTER_WIFI_BSSID, + FILTER_AUDIO_JACK, + FILTER_COMMUNICATION_TYPE, }; bool allowed[FILTER_KEY_LIMIT] = {false}; diff --git a/src/rule_info.h b/src/rule_info.h index def2da9..2c3b0cb 100644 --- a/src/rule_info.h +++ b/src/rule_info.h @@ -19,103 +19,91 @@ #define RULE_INFO "{ \"templates\": [\ {\ - \"name\": \"timer/event\",\ + \"name\": \"time/alarm\",\ \"attributes\": [ { \"key\": \"TimeOfDay\", \"type\": 1, \"min\": 0, \"max\": 1439}, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] } ]\ },\ {\ - \"name\": \"timer/state\",\ + \"name\": \"time/now\",\ \"attributes\": [ { \"key\": \"TimeOfDay\", \"type\": 1, \"min\": 0, \"max\": 1439}, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] }, { \"key\" : \"DayOfMonth\", \"type\": 1, \"min\": 1, \"max\": 31} ]\ },\ {\ - \"name\": \"system/state/battery\",\ + \"name\": \"system/battery\",\ \"attributes\": [ { \"key\" : \"Level\", \"type\": 2, \"acceptable\": [ \"Empty\", \"Critical\", \"Low\", \"Normal\", \"High\", \"Full\" ] }, { \"key\": \"IsCharging\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ },\ {\ - \"name\": \"system/state/charger\",\ + \"name\": \"system/charger\",\ \"attributes\": [ { \"key\": \"IsConnected\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ },\ {\ - \"name\": \"system/state/flight_mode\",\ - \"attributes\": [ { \"key\": \"IsEnabled\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ - },\ - {\ - \"name\": \"system/state/gps\",\ + \"name\": \"system/gps\",\ \"attributes\": [ { \"key\" : \"State\", \"type\": 2, \"acceptable\": [ \"Disabled\", \"Searching\", \"Connected\" ] } ]\ },\ {\ - \"name\": \"system/state/headphone\",\ + \"name\": \"system/headphone\",\ \"attributes\": [{ \"key\": \"IsConnected\", \"type\": 1, \"min\": 0, \"max\": 1 }, { \"key\": \"Type\", \"type\": 2, \"acceptable\": [ \"Normal\", \"Headset\", \"Bluetooth\" ] } ]\ },\ {\ - \"name\": \"system/state/ps_mode\",\ - \"attributes\": [ { \"key\": \"IsEnabled\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ - },\ - {\ - \"name\": \"system/state/silent_mode\",\ - \"attributes\": [ { \"key\": \"IsEnabled\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ - },\ - {\ - \"name\": \"system/state/vibration_mode\",\ + \"name\": \"system/psmode\",\ \"attributes\": [ { \"key\": \"IsEnabled\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ },\ {\ - \"name\": \"system/state/usb\",\ + \"name\": \"system/usb\",\ \"attributes\": [ { \"key\": \"IsConnected\", \"type\": 1, \"min\": 0, \"max\": 1 } ]\ },\ {\ - \"name\": \"system/state/wifi\",\ + \"name\": \"system/wifi\",\ \"attributes\": [ { \"key\" : \"State\", \"type\": 2, \"acceptable\": [ \"Disabled\", \"Unconnected\", \"Connected\" ] }, { \"key\": \"BSSID\", \"type\": 2, \"acceptable\": [ ] } ]\ },\ {\ - \"name\": \"social/state/call\",\ + \"name\": \"social/call\",\ \"attributes\": [ { \"key\" : \"Medium\", \"type\": 2, \"acceptable\": [ \"Voice\", \"Video\" ] }, { \"key\" : \"State\", \"type\": 2, \"acceptable\": [ \"Idle\", \"Connecting\", \"Connected\" ] }, { \"key\": \"Address\", \"type\": 2, \"acceptable\": [ ] } ]\ },\ {\ - \"name\": \"social/event/email\",\ + \"name\": \"social/email\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"Received\", \"Sent\" ] } ]\ },\ {\ - \"name\": \"social/event/message\",\ + \"name\": \"social/message\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"Received\" ] } , { \"key\": \"Type\", \"type\": 2, \"acceptable\": [ \"SMS\", \"MMS\" ] }, { \"key\": \"Address\", \"type\": 2, \"acceptable\": [ ] } ]\ },\ {\ - \"name\": \"activity/event/stationary\",\ + \"name\": \"activity/stationary\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"Detected\" ] }, { \"key\": \"Accuracy\", \"type\": 2, \"acceptable\": [ \"High\", \"Normal\", \"Low\" ] } ]\ },\ {\ - \"name\": \"activity/event/walking\",\ + \"name\": \"activity/walking\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"Detected\" ] }, { \"key\": \"Accuracy\", \"type\": 2, \"acceptable\": [ \"High\", \"Normal\", \"Low\" ] } ]\ },\ {\ - \"name\": \"activity/event/running\",\ + \"name\": \"activity/running\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"Detected\" ] }, { \"key\": \"Accuracy\", \"type\": 2, \"acceptable\": [ \"High\", \"Normal\", \"Low\" ] } ]\ },\ {\ - \"name\": \"activity/event/in_vehicle\",\ + \"name\": \"activity/in_vehicle\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"Detected\" ] }, { \"key\": \"Accuracy\", \"type\": 2, \"acceptable\": [ \"High\", \"Normal\", \"Low\" ] } ]\ },\ {\ - \"name\": \"place/event/geofence\",\ + \"name\": \"place/geofence\",\ \"attributes\": [ { \"key\": \"Event\", \"type\": 2, \"acceptable\": [ \"In\", \"Out\" ] } ],\ \"option\": [ { \"key\": \"PlaceId\", \"type\": 1, \"min\": 1, \"max\": -1 } ]\ },\ {\ - \"name\": \"app/history/use_freq\",\ + \"name\": \"stats/app/frequency\",\ \"attributes\": [ { \"key\": \"Rank\", \"type\": 1, \"min\": 1, \"max\": -1 }, { \"key\": \"TotalCount\", \"type\": 1, \"min\": 0, \"max\": -1 } ],\ \"option\": [ { \"key\": \"AppId\", \"type\": 2, \"acceptable\": [ ] }, { \"key\": \"TimeOfDay\", \"type\": 2, \"acceptable\": [ ] }, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] } ]\ },\ {\ - \"name\": \"contact/history/comm_freq\",\ + \"name\": \"stats/contact/frequency\",\ \"attributes\": [ { \"key\": \"Rank\", \"type\": 1, \"min\": 1, \"max\": -1 }, { \"key\": \"TotalCount\", \"type\": 1, \"min\": 0, \"max\": -1 } ],\ \"option\": [ { \"key\": \"Address\", \"type\": 2, \"acceptable\": [ ] }, { \"key\": \"TimeOfDay\", \"type\": 2, \"acceptable\": [ ] }, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] } ]\ },\ {\ - \"name\": \"music/history/play_freq\",\ + \"name\": \"stats/music/frequency\",\ \"attributes\": [ { \"key\": \"TotalCount\", \"type\": 1, \"min\": 0, \"max\": -1 } ],\ \"option\": [ { \"key\": \"TimeOfDay\", \"type\": 2, \"acceptable\": [ ] }, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] } ]\ },\ {\ - \"name\": \"video/history/play_freq\",\ + \"name\": \"stats/video/frequency\",\ \"attributes\": [ { \"key\": \"TotalCount\", \"type\": 1, \"min\": 0, \"max\": -1 } ],\ \"option\": [ { \"key\": \"TimeOfDay\", \"type\": 2, \"acceptable\": [ ] }, { \"key\": \"DayOfWeek\", \"type\": 2, \"acceptable\": [ \"Mon\", \"Tue\", \"Wed\", \"Thu\", \"Fri\", \"Sat\", \"Sun\", \"Weekday\", \"Weekend\" ] } ]\ }\