X-Git-Url: http://pilppa.org/gitweb/?p=lib1wire.git;a=blobdiff_plain;f=src%2FDataReader.cc;fp=src%2FDeviceData.cc;h=799ead10a7fc411f6c4eaa4cfac7b006080c8418;hp=c564377a146d747b9c051092e3ef55bae5664fa1;hb=da203ad44792ca37320768f4cbe68587c4806910;hpb=6caee6cb22c1334701afe7aa30bcf9668ca3a5c5

diff --git a/src/DeviceData.cc b/src/DataReader.cc
similarity index 85%
rename from src/DeviceData.cc
rename to src/DataReader.cc
index c564377..799ead1 100644
--- a/src/DeviceData.cc
+++ b/src/DataReader.cc
@@ -1,5 +1,5 @@
 /*
- * DeviceData.cc
+ * DataReader.cc
  *
  *  Created on: Nov 7, 2010
  *      Author: lamikr
@@ -12,7 +12,7 @@
 #include <string.h>
 
 #include "W1Util.hh"
-#include "DeviceData.hh"
+#include "DataReader.hh"
 #include "StoreDay.hh"
 #include "StoreCache.hh"
 #include "DeviceConfig.hh"
@@ -33,7 +33,7 @@ bool string_to_number(NumberDataType& result,
 	return !(iss >> format >> result).fail();
 }
 
-DeviceData::DeviceData(string device_id_param) {
+DataReader::DataReader(string device_id_param) {
 	string	base_dir;
 
 	device_config	= NULL;
@@ -44,14 +44,14 @@ DeviceData::DeviceData(string device_id_param) {
 	device_ch_dir	= W1Util::concat_paths(device_ch_dir, device_id);
 }
 
-DeviceData::~DeviceData() {
+DataReader::~DataReader() {
 	if (device_config != NULL) {
 		delete(device_config);
 		device_config	= NULL;
 	}
 }
 
-Data *DeviceData::find_newest_data(vector<string> year_name_vector_param) {
+Data *DataReader::find_newest_data(vector<string> year_name_vector_param) {
 	string	year_name;
 	int	size;
 	Data	*ret_val;
@@ -70,7 +70,7 @@ Data *DeviceData::find_newest_data(vector<string> year_name_vector_param) {
 	return ret_val;
 }
 
-Data *DeviceData::find_oldest_data(vector<string> year_name_vector_param) {
+Data *DataReader::find_oldest_data(vector<string> year_name_vector_param) {
 	int	size;
 	string	year_name;
 	Data	*ret_val;
@@ -89,7 +89,7 @@ Data *DeviceData::find_oldest_data(vector<string> year_name_vector_param) {
 	return ret_val;
 }
 
-DataRange *DeviceData::get_data_range() {
+DataRange *DataReader::get_data_range() {
 	DataRange	*ret_val;
 	vector<string>	y_list;
 	Data		*o_data;
@@ -150,7 +150,7 @@ EnumSummaryPeriod get_period_type(Date *start_date,
 	return ret_val;
 }
 
-DataRange *DeviceData::get_summary(Date *date_param,
+DataRange *DataReader::get_summary(Date *date_param,
 				EnumSummaryCalculationType calc_type_param,
 				EnumSummaryPeriod period_type_param) {
 	DataRange	*ret_val;
@@ -192,12 +192,12 @@ DataRange *DeviceData::get_summary(Date *date_param,
 	return ret_val;
 }
 
-DataRange *DeviceData::get_yearly_summary(Date *date,
+DataRange *DataReader::get_yearly_summary(Date *date,
 				EnumSummaryCalculationType calc_type_param) {
 	return get_summary(date, calc_type_param, PERIOD_YEARLY);
 }
 
-DataRange *DeviceData::get_yearly_summary(Date *date) {
+DataRange *DataReader::get_yearly_summary(Date *date) {
 	DataRange	*ret_val;
 
 	if (device_config == NULL) {
@@ -208,7 +208,7 @@ DataRange *DeviceData::get_yearly_summary(Date *date) {
 	return ret_val;
 }
 
-DataRange *DeviceData::get_yearly_summary(Date *start_date,
+DataRange *DataReader::get_yearly_summary(Date *start_date,
 					Date *end_date) {
 	DataRange	*ret_val;
 	DataRange	*data;
@@ -233,12 +233,12 @@ DataRange *DeviceData::get_yearly_summary(Date *start_date,
 	return ret_val;
 }
 
-DataRange *DeviceData::get_monthly_summary(Date *date,
+DataRange *DataReader::get_monthly_summary(Date *date,
 				EnumSummaryCalculationType calc_type_param) {
 	return get_summary(date, calc_type_param, PERIOD_MONTHLY);
 }
 
-DataRange *DeviceData::get_monthly_summary(Date *date) {
+DataRange *DataReader::get_monthly_summary(Date *date) {
 	DataRange	*ret_val;
 
 	if (device_config == NULL) {
@@ -249,7 +249,7 @@ DataRange *DeviceData::get_monthly_summary(Date *date) {
 	return ret_val;
 }
 
-DataRange *DeviceData::get_monthly_summary(Date *start_date,
+DataRange *DataReader::get_monthly_summary(Date *start_date,
 					Date *end_date) {
 	DataRange	*ret_val;
 	DataRange	*data;
@@ -274,12 +274,12 @@ DataRange *DeviceData::get_monthly_summary(Date *start_date,
 	return ret_val;
 }
 
-DataRange *DeviceData::get_daily_summary(Date *date,
+DataRange *DataReader::get_daily_summary(Date *date,
 				EnumSummaryCalculationType calc_type_param) {
 	return get_summary(date, calc_type_param, PERIOD_DAILY);
 }
 
-DataRange *DeviceData::get_daily_summary(Date *date) {
+DataRange *DataReader::get_daily_summary(Date *date) {
 	DataRange	*ret_val;
 
 	if (device_config == NULL) {
@@ -290,7 +290,7 @@ DataRange *DeviceData::get_daily_summary(Date *date) {
 	return ret_val;
 }
 
-DataRange *DeviceData::get_daily_summary(Date *start_date,
+DataRange *DataReader::get_daily_summary(Date *start_date,
 					Date *end_date) {
 	DataRange	*ret_val;
 	DataRange	*data;
@@ -315,12 +315,12 @@ DataRange *DeviceData::get_daily_summary(Date *start_date,
 	return ret_val;
 }
 
-DataRange *DeviceData::get_hourly_summary(Date *date,
+DataRange *DataReader::get_hourly_summary(Date *date,
 		EnumSummaryCalculationType calc_type_param) {
 	return get_summary(date, calc_type_param, PERIOD_HOURLY);
 }
 
-DataRange *DeviceData::get_hourly_summary(Date *date) {
+DataRange *DataReader::get_hourly_summary(Date *date) {
 	DataRange	*ret_val;
 
 	if (device_config == NULL) {
@@ -331,7 +331,7 @@ DataRange *DeviceData::get_hourly_summary(Date *date) {
 	return ret_val;
 }
 
-DataRange *DeviceData::get_hourly_summary(Date *start_date,
+DataRange *DataReader::get_hourly_summary(Date *start_date,
 					Date *end_date) {
 	DataRange	*ret_val;
 	DataRange	*dta_lst;
@@ -363,7 +363,7 @@ DataRange *DeviceData::get_hourly_summary(Date *start_date,
 	return ret_val;
 }
 
-DataRange *DeviceData::get_data(Date *start_date,
+DataRange *DataReader::get_data(Date *start_date,
 				Date *end_date) {
 	DataRange		*ret_val;
 	EnumSummaryPeriod	period;
@@ -399,3 +399,20 @@ DataRange *DeviceData::get_data(Date *start_date,
 	}
 	return ret_val;
 }
+
+string DataReader::get_device_id() {
+	return device_id;
+}
+
+/**
+ * Read device type from the device specific config file
+ */
+string DataReader::get_device_type() {
+	string	ret_val;
+
+	if (device_config == NULL) {
+		device_config	= Factory::get_device_config(device_id);
+		ret_val		= device_config->get_cfg_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
+	}
+	return ret_val;
+}