sensor data read fixes.

[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 acddf0d6fd69d7d4c73c2695d19da07ab5a3c6ad..48425e21b342069775512f050fcaeb0bc9c2d85d 100644 (file)
--- a/src_test/test_w1_datalog_read.cc
+++ b/src_test/test_w1_datalog_read.cc
@@ -12,15 +12,17 @@
 #include <stdlib.h>
 
 #include <plp/log.h>
+#include <plp/Date.hh>
+#include <plp/DataReader.hh>
+#include <plp/DeviceConfig.hh>
+#include <plp/Device.hh>
+#include <plp/SensorDevice.hh>
 
-#include "W1DataList.hh"
-#include "W1Store.hh"
-#include "W1Scanner.hh"
+#include "Factory.hh"
 
-#include "W1Util.hh"
-
-using namespace w1;
 using namespace std;
+using namespace plp;
+using namespace w1;
 
 bool try_parse_long(const char *str, long *result) {
        int     new_result;
@@ -46,47 +48,63 @@ bool try_parse_long(const char *str, long *result) {
 }
 
 int main(int argc, char** argv) {
-       int             round;
-       string          loc;
-       bool            err_flg;
-       Data            *fdata;
-       Data            *ldata;
-       W1DataList      *dlist;
-       DataRange       *dr;
-       DataRange       *dr2;
+       string                          loc;
+       Data                            *fdata;
+       Data                            *ldata;
+       DataReader                      *reader;
+       Device                          *dev;
+       SensorDevice                    *device;
+       DataRange                       *dr;
+       DataRange                       *dr2;
+       list<Device *>                  dev_lst;
+       list<Device *>::iterator        list_iter;
 
        // default values than can be overwritten with parameters
-       //location      = "/tmp/";
-       loc     = "/home/lamikr/own/src/plp/w1data2/";
+       loc     = DeviceConfig::get_base_dir_name();
        if (argc > 1) {
                loc     = argv[1];
                log_info("storage location: %s\n", loc.c_str());
+               DeviceConfig::set_base_dir_name(loc);
        }
        else {
                log_warning("No storage location parameter given, using default location: %s\n", loc.c_str());
        }
-       W1Store::set_store_base_dir(loc.c_str());
-       dlist   = new W1DataList("0008014e9e09");
-       if (dlist != NULL) {
-               dr      = dlist->get_data_range();
-               if (dr != NULL) {
-                       fdata   = dr->get_first_data();
-                       if (fdata != NULL) {
-                               fdata->printout();
-                               ldata   = dr->get_last_data();
-                               if (ldata != NULL) {
-                                       ldata->printout();
-                                       dr2     = dlist->get_data(&fdata->get_date(), &ldata->get_date());
-                                       delete(ldata);
-                                       if (dr2 != NULL) {
-                                               delete(dr2);
+       dev_lst = Factory::get_device_list();
+       for(list_iter = dev_lst.begin(); list_iter != dev_lst.end(); list_iter++) {
+               dev     = (Device *)*list_iter;
+               if (dev != NULL) {
+                       device  = dynamic_cast<SensorDevice *>(dev);
+                       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     = reader->get_data(&d1, &d2);
+                                                               if (dr2 != NULL) {
+                                                                       dr2->printout();
+                                                                       delete(dr2);
+                                                               }
+                                                               delete(ldata);
+                                                       }
+                                                       delete(fdata);
+                                               }
+                                               delete(dr);
                                        }
+                                       delete(reader);
                                }
-                               delete(fdata);
                        }
-                       delete(dr);
                }
-               delete(dlist);
        }
        return 0;
 }