Api cleanups for device querying

[lib1wire.git] / src_test / test_w1_datalog_read.cc

diff --git a/src_test/test_w1_datalog_read.cc b/src_test/test_w1_datalog_read.cc
index b9b8b7adbfde55100718137f39dc84e4e8c04dff..2658c46ebffb26f2fb7a2681b2faa986847f167d 100644 (file)
--- a/src_test/test_w1_datalog_read.cc
+++ b/src_test/test_w1_datalog_read.cc
@@ -14,7 +14,7 @@
 #include <plp/log.h>
 
 #include "Date.hh"
-#include "DeviceData.hh"
+#include "DataReader.hh"
 #include "DeviceConfig.hh"
 #include "Factory.hh"
 #include "W1Util.hh"
@@ -47,13 +47,15 @@ bool try_parse_long(const char *str, long *result) {
 }
 
 int main(int argc, char** argv) {
-       string                  loc;
-       Data                    *fdata;
-       Data                    *ldata;
-       DeviceData              *dta;
-       DataRange               *dr;
-       DataRange               *dr2;
-       list<DeviceData *>      dta_list;
+       string                          loc;
+       Data                            *fdata;
+       Data                            *ldata;
+       DataReader                      *reader;
+       Device                          *device;
+       DataRange                       *dr;
+       DataRange                       *dr2;
+       list<Device *>                  dev_lst;
+       list<Device *>::iterator        list_iter;
 
        // default values than can be overwritten with parameters
        loc     = "/tmp/w1data";
@@ -65,35 +67,38 @@ int main(int argc, char** argv) {
                log_warning("No storage location parameter given, using default location: %s\n", loc.c_str());
        }
        DeviceConfig::set_base_dir_name(loc);
-       dta_list        = Factory::get_device_data_list();
-       for(list<DeviceData *>::iterator list_iter = dta_list.begin(); list_iter != dta_list.end(); list_iter++) {
-               dta     = (DeviceData *)*list_iter;
-               if (dta != NULL) {
-                       dr      = dta->get_data_range();
-                       if (dr != NULL) {
-                               fdata   = dr->get_first();
-                               if (fdata != NULL) {
-                                       fdata->printout();
-                                       ldata   = dr->get_last();
-                                       if (ldata != NULL) {
-                                               ldata->printout();
-                                               plp::Date d1;
-                                               plp::Date d2;
+       dev_lst = Factory::get_device_list();
+       for(list_iter = dev_lst.begin(); list_iter != dev_lst.end(); list_iter++) {
+               device  = (Device *)*list_iter;
+               if (device != NULL) {
+                       reader  = device->get_device_data();
+                       if (reader != NULL) {
+                               dr      = reader->get_data_range();
+                               if (dr != NULL) {
+                                       fdata   = dr->get_first();
+                                       if (fdata != NULL) {
+                                               fdata->printout();
+                                               ldata   = dr->get_last();
+                                               if (ldata != NULL) {
+                                                       ldata->printout();
+                                                       plp::Date d1;
+                                                       plp::Date d2;
 
-                                               d1      = fdata->get_date();
-                                               d2      = ldata->get_date();
-                                               dr2     = dta->get_data(&d1, &d2);
-                                               if (dr2 != NULL) {
-                                                       dr2->printout();
-                                                       delete(dr2);
+                                                       d1      = fdata->get_date();
+                                                       d2      = ldata->get_date();
+                                                       dr2     = reader->get_data(&d1, &d2);
+                                                       if (dr2 != NULL) {
+                                                               dr2->printout();
+                                                               delete(dr2);
+                                                       }
+                                                       delete(ldata);
                                                }
-                                               delete(ldata);
+                                               delete(fdata);
                                        }
-                                       delete(fdata);
+                                       delete(dr);
                                }
-                               delete(dr);
+                               delete(reader);
                        }
-                       delete(dta);
                }
        }
        return 0;