string ret_val;
char buffer[30];
string bd_name;
+ string period_name;
+ string calc_type;
+
+ period_name = DataSummary::get_summary_period_name(period_type_param);
+ calc_type = DataSummary::get_summary_calculation_name(calc_type_param);
bd_name = DeviceConfig::get_base_dir_name();
bd_name = FileUtil::concat_paths(bd_name, CACHE_DIR_NAME);
bd_name = FileUtil::concat_paths(bd_name, device_id_param);
- bd_name = FileUtil::concat_paths(bd_name, SUMMARY_PERIOD_NAMES_ARRAY[period_type_param]);
- bd_name = FileUtil::concat_paths(bd_name, CALCULATION_TYPE_NAMES_ARRAY[calc_type_param]);
+ bd_name = FileUtil::concat_paths(bd_name, period_name);
+ bd_name = FileUtil::concat_paths(bd_name, calc_type);
if (period_type_param == PERIOD_YEARLY) {
ret_val = bd_name;
}
cur_data = NULL;
res_data = NULL;
cnt = 0;
+ val_cnt = 0;
while(cur_date->before(max_date)) {
if (period_type_param == PERIOD_YEARLY) {
store = new StoreCache(device_id, cur_date);