X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src_test%2Ftest_w1_datalog_read.cc;h=48425e21b342069775512f050fcaeb0bc9c2d85d;hb=557fe3a639d7bd6fd146fdc9d573cf53bb2adff0;hp=2658c46ebffb26f2fb7a2681b2faa986847f167d;hpb=da203ad44792ca37320768f4cbe68587c4806910;p=lib1wire.git

diff --git a/src_test/test_w1_datalog_read.cc b/src_test/test_w1_datalog_read.cc
index 2658c46..48425e2 100644
--- a/src_test/test_w1_datalog_read.cc
+++ b/src_test/test_w1_datalog_read.cc
@@ -12,12 +12,13 @@
 #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 "Date.hh"
-#include "DataReader.hh"
-#include "DeviceConfig.hh"
 #include "Factory.hh"
-#include "W1Util.hh"
 
 using namespace std;
 using namespace plp;
@@ -51,53 +52,57 @@ int main(int argc, char** argv) {
 	Data				*fdata;
 	Data				*ldata;
 	DataReader			*reader;
-	Device				*device;
+	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
-	loc	= "/tmp/w1data";
+	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());
 	}
-	DeviceConfig::set_base_dir_name(loc);
 	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;
+		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);
+								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(reader);
 			}
 		}
 	}