X-Git-Url: http://pilppa.org/gitweb/?p=libplp.git;a=blobdiff_plain;f=src%2FStoreCache.cc;h=0d62d777f5ba586b89bb1e0c0466d33800c9aabe;hp=3506292c36a01fabb7d3f4ce1cc74f35ed6b74b2;hb=860d8c023b82eeca9833d4a3f534c6d11a9523f3;hpb=65f22bbea2531f7cd492d6108b8902f92b7750a8 diff --git a/src/StoreCache.cc b/src/StoreCache.cc index 3506292..0d62d77 100644 --- a/src/StoreCache.cc +++ b/src/StoreCache.cc @@ -31,12 +31,17 @@ string StoreCache::get_dir_name(string device_id_param, 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; }