Support for querying the list devices having data stored.

[lib1wire.git] / src / DeviceData.cc

diff --git a/src/W1DataList.cc b/src/DeviceData.cc
similarity index 90%
rename from src/W1DataList.cc
rename to src/DeviceData.cc
index 9f2674f0971b35b328fcb56f74272212fd0427f8..259d821ae38310cebc583baeab048c4e637af82c 100644 (file)
--- a/src/W1DataList.cc
+++ b/src/DeviceData.cc
@@ -1,5 +1,5 @@
 /*
- * W1DataList.cc
+ * DeviceData.cc
  *
  *  Created on: Nov 7, 2010
  *      Author: lamikr
@@ -10,9 +10,10 @@
 #include <string.h>
 
 #include "W1Util.hh"
-#include "W1DataList.hh"
+#include "DeviceData.hh"
 #include "W1Store.hh"
 #include "DeviceConfig.hh"
+#include "Factory.hh"
 
 #include "plp/log.h"
 
@@ -20,10 +21,10 @@ using namespace w1;
 using namespace std;
 using namespace plp;
 
-W1DataList::W1DataList(string device_id_param) {
+DeviceData::DeviceData(string device_id_param) {
        string          base_dir;
 
-       device_config           = new DeviceConfig(device_id_param);
+       device_config           = Factory::get_device_config(device_id_param);
        summary_calc_type       = device_config->get_summary_calculation_type();
        device_id               = device_id_param;
        base_dir                = DeviceConfig::get_base_dir_name();
@@ -32,11 +33,11 @@ W1DataList::W1DataList(string device_id_param) {
        device_ch_dir           = W1Util::concat_paths(device_ch_dir, device_id);
 }
 
-W1DataList::~W1DataList() {
+DeviceData::~DeviceData() {
        delete(device_config);
 }
 
-Data *W1DataList::find_oldest_data(vector<string> year_vector) {
+Data *DeviceData::find_oldest_data(vector<string> year_vector) {
        unsigned int    ii;
        string          year_dir;
        string          month_dir;
@@ -70,7 +71,7 @@ Data *W1DataList::find_oldest_data(vector<string> year_vector) {
        return ret_val;
 }
 
-Data *W1DataList::find_newest_data(vector<string> year_vector) {
+Data *DeviceData::find_newest_data(vector<string> year_vector) {
        int             ii;
        string          year_dir;
        string          month_dir;
@@ -107,7 +108,7 @@ Data *W1DataList::find_newest_data(vector<string> year_vector) {
        return ret_val;
 }
 
-DataRange *W1DataList::get_data_range() {
+DataRange *DeviceData::get_data_range() {
        DataRange       *ret_val;
        vector<string>  year_list;
        Data            *first_data;
@@ -168,7 +169,7 @@ long int get_interval_type(Date *start_date,
        return ret_val;
 }
 
-Data *W1DataList::get_daily_summary(Date *date) {
+Data *DeviceData::get_daily_summary(Date *date) {
        Data    *ret_val;
        W1Store *store;
 
@@ -198,7 +199,7 @@ Data *W1DataList::get_daily_summary(Date *date) {
        return ret_val;
 }
 
-DataRange *W1DataList::get_daily_summary(Date *start_date,
+DataRange *DeviceData::get_daily_summary(Date *start_date,
                                        Date *end_date) {
        DataRange       *ret_val;
        Data            *data;
@@ -221,7 +222,7 @@ DataRange *W1DataList::get_daily_summary(Date *start_date,
        return ret_val;
 }
 
-DataRange *W1DataList::get_data(Date *start_date,
+DataRange *DeviceData::get_data(Date *start_date,
                                Date *end_date) {
        DataRange       *ret_val;
        int             int_type;