X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FDataReader.cc;h=0e6ebf380fb2e335fb028956607abd8f430891d7;hb=23a30eb765fc6aaf347da839567140ae41e8cc6b;hp=9ba287284c9526792713029aed21490e49e6f937;hpb=dc9f6eb0a994563714566988ea041803ddd7e25d;p=libplp.git

diff --git a/src/DataReader.cc b/src/DataReader.cc
index 9ba2872..0e6ebf3 100644
--- a/src/DataReader.cc
+++ b/src/DataReader.cc
@@ -74,7 +74,9 @@ Data *DataReader::get_latest_data() {
 
 	ret_val	= NULL;
 	y_list	= FileUtil::get_subdirectories(device_dir);
-	ret_val	= find_latest_data(y_list);
+	if (y_list.size() > 0) {
+		ret_val	= find_latest_data(y_list);
+	}
 	return ret_val;
 }
 
@@ -297,12 +299,17 @@ DataRange *DataReader::get_daily_summary() {
  * Get Daily summary specified by the calc_type from the latest date.
  */
 DataRange *DataReader::get_daily_summary(EnumSummaryCalculationType calc_type_param) {
-	Data	*data;
-	Date	date;
+	Data		*data;
+	Date		date;
+	DataRange	*ret_val;
 
+	ret_val	= NULL;
 	data	= get_latest_data();
-	date	= data->get_date();
-	return get_daily_summary(&date, calc_type_param);
+	if (data != NULL) {
+		date	= data->get_date();
+		ret_val	= get_daily_summary(&date, calc_type_param);
+	}
+	return ret_val;
 }
 
 DataRange *DataReader::get_daily_summary(Date *date,
@@ -441,7 +448,7 @@ string DataReader::get_device_type() {
 
 	if (device_config == NULL) {
 		device_config	= DeviceConfig::get_device_config(device_id);
-		ret_val		= device_config->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
+		ret_val		= device_config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
 	}
 	return ret_val;
 }