X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1DataList.cc;h=5f85db07b6420b9ae18c4810ca02099bef9c3d92;hb=d7ead1c059ca51e1d71e0f3928f41733d4c7f29c;hp=e05f9baaec76c2f8fec5f67ed9d0a4a2eed6f6a6;hpb=e3fe75505f606622b3a21cf1c4b71b7144639e06;p=lib1wire.git

diff --git a/src/W1DataList.cc b/src/W1DataList.cc
index e05f9ba..5f85db0 100644
--- a/src/W1DataList.cc
+++ b/src/W1DataList.cc
@@ -167,14 +167,7 @@ long int get_interval_type(Date *start_date,
 	return ret_val;
 }
 
-string W1DataList::get_day_data(Date *date) {
-	string ret_val;
-
-	ret_val	= W1Store::get_file_name(device_id, date);
-	return ret_val;
-}
-
-Data *W1DataList::get_avg_day_data(Date *date) {
+Data *W1DataList::get_daily_summary(Date *date) {
 	Data	*data;
 	W1Store	*store;
 
@@ -187,7 +180,7 @@ Data *W1DataList::get_avg_day_data(Date *date) {
 	return data;
 }
 
-DataRange *W1DataList::get_avg_day_data(Date *start_date,
+DataRange *W1DataList::get_daily_summary(Date *start_date,
 					Date *end_date) {
 	DataRange	*ret_val;
 	Data		*data;
@@ -196,7 +189,7 @@ DataRange *W1DataList::get_avg_day_data(Date *start_date,
 	ret_val	= NULL;
 	date	= start_date->clone();
 	while(date->before(*end_date)) {
-		data	= get_avg_day_data(date);
+		data	= get_daily_summary(date);
 		if (ret_val == NULL) {
 			ret_val	= new DataRange(*data);
 		}
@@ -221,23 +214,23 @@ DataRange *W1DataList::get_data(Date *start_date,
 	int_type	= get_interval_type(start_date, end_date);
 	switch(int_type) {
 		case 0:
-			log_debug("get avg year data\n");
+			log_debug("get yearly summary\n");
 			break;
 		case 1:
-			log_debug("get avg month data\n");
+			log_debug("get monthly summary\n");
 			break;
 		case 2:
-			log_debug("get avg day data\n");
-			ret_val	= get_avg_day_data(start_date, end_date);
+			log_debug("get daily summary\n");
+			ret_val	= get_daily_summary(start_date, end_date);
 			break;
 		case 3:
-			log_debug("get avg hour data\n");
+			log_debug("get hourly summary\n");
 			break;
 		case 4:
-			log_debug("get avg min data\n");
+			log_debug("get minute summary data\n");
 			break;
 		case 5:
-			log_debug("get avg sec data\n");
+			log_debug("get second summary data\n");
 			break;
 	}
 	return ret_val;