ret_val->printout();
}
else {
- log_error("Could not read data log for device: %s\n", device_id.c_str());
+ log_error("%s: Could not read data log for device %s. Data not found.\n",
+ date_param->to_string().c_str(),
+ device_id.c_str());
}
}
else {
- log_error("Could not read data log for device: %s\n", device_id.c_str());
+ log_error("%s: Could not read data log for device: %s. Memory allocation error..\n",
+ date_param->to_string().c_str(),
+ device_id.c_str());
}
delete(store);
return ret_val;
ret_val = NULL;
date = start_date->clone();
while(date->before_or_equal_year(end_date)) {
- data = get_yearly_summary(date);
- if (data != NULL) {
- if (ret_val == NULL) {
- ret_val = new DataRange(data);
- }
- else {
- ret_val->add(data);
+ if (StoreDay::exist_in_year(device_id, date, false)) {
+ data = get_yearly_summary(date);
+ if (data != NULL) {
+ if (ret_val == NULL) {
+ ret_val = new DataRange(data);
+ }
+ else {
+ ret_val->add(data);
+ }
+ delete(data);
}
- delete(data);
}
date->next_year();
}
ret_val = NULL;
date = start_date->clone();
while(date->before_or_equal_month(end_date)) {
- data = get_monthly_summary(date);
- if (data != NULL) {
- if (ret_val == NULL) {
- ret_val = new DataRange(data);
- }
- else {
- ret_val->add(data);
+ if (StoreDay::exist_in_month(device_id, date, false)) {
+ data = get_monthly_summary(date);
+ if (data != NULL) {
+ if (ret_val == NULL) {
+ ret_val = new DataRange(data);
+ }
+ else {
+ ret_val->add(data);
+ }
+ delete(data);
}
- delete(data);
+ date->next_month();
}
- date->next_month();
}
delete(date);
return ret_val;
ret_val = NULL;
date = start_date->clone();
while(date->before_or_equal_day(end_date)) {
- data = get_daily_summary(date);
- if (data != NULL) {
- if (ret_val == NULL) {
- ret_val = new DataRange(data);
- }
- else {
- ret_val->add(data);
+ if (StoreDay::exist(device_id, date, false)) {
+ data = get_daily_summary(date);
+ if (data != NULL) {
+ if (ret_val == NULL) {
+ ret_val = new DataRange(data);
+ }
+ else {
+ ret_val->add(data);
+ }
+ delete(data);
}
- delete(data);
}
date->next_day();
}