W1Store --> Store...

[lib1wire.git] / src / DeviceData.cc

diff --git a/src/DeviceData.cc b/src/DeviceData.cc
index cfb29a7b8576cc4559c13e437fe1a492bea69fbf..d066bbdc3f96f9f423d0c58935b3709baae9547f 100644 (file)
--- a/src/DeviceData.cc
+++ b/src/DeviceData.cc
@@ -11,7 +11,7 @@
 
 #include "W1Util.hh"
 #include "DeviceData.hh"
-#include "W1Store.hh"
+#include "Store.hh"
 #include "DeviceConfig.hh"
 #include "Factory.hh"
 
@@ -44,7 +44,7 @@ Data *DeviceData::find_oldest_data(vector<string> year_vector) {
        vector<string>  mon_vcr;
        vector<string>  dta_vcr;
        string          f_name;
-       W1Store         *store;
+       Store           *store;
        Data            *ret_val;
 
        ret_val = NULL;
@@ -61,7 +61,7 @@ Data *DeviceData::find_oldest_data(vector<string> year_vector) {
                        if (dta_vcr.size() > 0) {
                                f_name  = dta_vcr.at(0);
                                f_name  = W1Util::concat_paths(mon_dr, f_name);
-                               store   = new W1Store(f_name);
+                               store   = new Store(f_name);
                                ret_val = store->get_oldest_data();
                                delete(store);
                                break;
@@ -80,7 +80,7 @@ Data *DeviceData::find_newest_data(vector<string> year_vector) {
        string          f_name;
        Data            *ret_val;
        int             size;
-       W1Store         *store;
+       Store           *store;
 
        ret_val = NULL;
        size    = year_vector.size();
@@ -98,7 +98,7 @@ Data *DeviceData::find_newest_data(vector<string> year_vector) {
                        if (size > 0) {
                                f_name  = d_vcr.at(size - 1);
                                f_name  = W1Util::concat_paths(mon_dr, f_name);
-                               store   = new W1Store(f_name);
+                               store   = new Store(f_name);
                                ret_val = store->get_newest_data();
                                delete(store);
                                break;
@@ -172,11 +172,12 @@ long int get_interval_type(Date *start_date,
 Data *DeviceData::get_daily_summary(Date *date,
                                int calc_type) {
        Data    *ret_val;
-       W1Store *store;
+       Store   *store;
        bool    suc_flg;
+       //Store *cache_store;
 
        ret_val = NULL;
-       store   = new W1Store(device_id, date);
+       store   = new Store(device_id, date);
        if (store != NULL) {
                suc_flg = store->load();
                if (suc_flg == true) {
@@ -187,16 +188,16 @@ Data *DeviceData::get_daily_summary(Date *date,
                                case DELTA:
                                        ret_val = store->get_delta();
                                        break;
-                               case MEAN:
-                               default:
-                                       ret_val = store->get_mean();
-                                       break;
                                case MAX:
                                        ret_val = store->get_max();
                                        break;
                                case MIN:
                                        ret_val = store->get_min();
                                        break;
+                               case MEAN:
+                               default:
+                                       ret_val = store->get_mean();
+                                       break;
                        }
                        if (ret_val != NULL) {
                                ret_val->printout();
@@ -231,7 +232,7 @@ DataRange *DeviceData::get_daily_summary(Date *start_date,
 
        ret_val = NULL;
        date    = start_date->clone();
-       while(date->before(*end_date)) {
+       while(date->before(end_date)) {
                data    = get_daily_summary(date);
                if (data != NULL) {
                        if (ret_val == NULL) {
@@ -251,10 +252,10 @@ DataRange *DeviceData::get_daily_summary(Date *start_date,
 vector<Data *> *DeviceData::get_hourly_summary(Date *date,
                                        int calc_type) {
        vector<Data *>  *ret_val;
-       W1Store         *store;
+       Store           *store;
 
        ret_val = NULL;
-       store   = new W1Store(device_id, date);
+       store   = new Store(device_id, date);
        store->load();
        switch(calc_type) {
                case SUM:
@@ -295,7 +296,7 @@ DataRange *DeviceData::get_hourly_summary(Date *start_date,
 
        ret_val = NULL;
        date    = start_date->clone();
-       while(date->before(*end_date)) {
+       while(date->before(end_date)) {
                dta_lst = get_hourly_summary(date);
                for(iter = dta_lst->begin(); iter != dta_lst->end(); iter++) {
                        data    = (Data *)*iter;