storage data cleanup. allow specifying storage dir location

[lib1wire.git] / src / W1Device.cc

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 48f366db655a1d74bdf92d717b629a03e7e8c168..fef721c55ff7fc757767d9570de0ec66af7567cd 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -5,14 +5,19 @@
  *      Author: lamikr
  */
 #include <iostream>
+#include <fstream>
+
 #include <time.h>
 
+#include "W1Store.hh"
 #include "W1Device.hh"
 
 using namespace w1;
 using namespace std;
 
-W1Device::W1Device(dirent *direntry, int family_code_param, string id_param) {
+W1Device::W1Device(dirent *direntry,
+               int family_code_param,
+               string id_param) {
        string rootdir;
        string device_dir;
        string temp_str;
@@ -22,7 +27,7 @@ W1Device::W1Device(dirent *direntry, int family_code_param, string id_param) {
        dir_path        = rootdir + "/" + direntry->d_name;
        slave_file      = dir_path + "/" + temp_str;
        family_code     = family_code_param;
-       id                      = id_param;
+       id              = id_param;
        name            = id_param;
 }
 
@@ -61,6 +66,54 @@ string W1Device::get_time() {
 void W1Device::printout() {
        string text;
 
-       text    = get_time() + ": device type = <unknown>, id = " + id + ", value = " + get_value();
+       text    = get_formatted_data();
        cout << text << endl;
 }
+
+string W1Device::get_formatted_data() {
+       string ret_val;
+       string val;
+
+       val     = get_value();
+       ret_val = get_formatted_data(val);
+       return ret_val;
+}
+
+string W1Device::get_formatted_data(string value) {
+       string ret_val;
+
+       ret_val = get_time() + "|" + get_devicetype_name() + "|" + id + "|" + value + " " + get_unit();
+       add_to_memory_cache(ret_val);
+       return ret_val;
+}
+
+void W1Device::add_to_memory_cache(std::string formatted_data) {
+       // TODO: add mutex for memory_cache
+       memory_cache.push_back(formatted_data);
+}
+
+void W1Device::store() {
+       W1Store::store(id, memory_cache);
+/*
+       string file_path = "/tmp/" + id + ".txt";
+       string text_line;
+       ofstream data_file(file_path.c_str(), ios::app);
+
+       cout << "storing to " << file_path << "data size " << memory_cache.size() << endl;
+       // TODO: add mutex to protect memory_cache while it's read and emptied
+       if (data_file.is_open()) {
+               while(memory_cache.size() > 0) {
+                       text_line       = memory_cache.front();
+                       memory_cache.pop_front();
+                       if (text_line.length() > 0) {
+                               cout << "storing line: " << text_line << endl;
+                               data_file << text_line << endl;
+                       }
+               }
+               data_file.close();
+       }
+       else {
+               cout << "could not open file " << file_path << " for writing data." << endl;
+       }
+*/
+}