initial device configuration support.

[lib1wire.git] / src / W1Store.cc

diff --git a/src/W1Store.cc b/src/W1Store.cc
index 5db7b9b2ef349ce525584193b6968f017f975655..23adbb02da5b57d9769da7f88c2f7ccd46bd7038 100644 (file)
--- a/src/W1Store.cc
+++ b/src/W1Store.cc
@@ -32,7 +32,7 @@ W1Store::W1Store(string device_id,
                Date *date_time) {
        store_data      = NULL;
        range_data      = NULL;
-       store_file_name = get_store_file_name(device_id, date_time);
+       store_file_name = get_file_name(device_id, date_time);
        log_debug("data file name: %s\n", store_file_name.c_str());
 }
 
@@ -49,7 +49,7 @@ W1Store::~W1Store() {
        }
 }
 
-void W1Store::set_store_base_dir(string store_param) {
+void W1Store::set_base_dir_name(string store_param) {
        int     pos;
        int     b_count;
 
@@ -63,11 +63,11 @@ void W1Store::set_store_base_dir(string store_param) {
        }
 }
 
-string W1Store::get_store_base_dir() {
+string W1Store::get_base_dir_name() {
        return store_base_dir;
 }
 
-string W1Store::get_store_dir_name(string device_id, Date *date_time) {
+string W1Store::get_dir_name(string device_id, Date *date_time) {
        string  ret_val;
        char    buffer[30];
 
@@ -77,7 +77,7 @@ string W1Store::get_store_dir_name(string device_id, Date *date_time) {
        return ret_val;
 }
 
-string W1Store::get_store_file_name(string device_id, Date *date_time) {
+string W1Store::get_file_name(string device_id, Date *date_time) {
        string  ret_val;
        string  fname;
        char    buffer[30];
@@ -85,7 +85,7 @@ string W1Store::get_store_file_name(string device_id, Date *date_time) {
        snprintf(buffer, 30, "%d-%02d-%02d", date_time->year, date_time->month, date_time->day);
        fname   = buffer;
        fname   = fname + DATAFILE_SUFFIX;
-       ret_val = get_store_dir_name(device_id, date_time);
+       ret_val = get_dir_name(device_id, date_time);
        ret_val = W1Util::concat_paths(ret_val, fname);
        return ret_val;
 }
@@ -98,7 +98,7 @@ void W1Store::store(std::string device_id,
        Date            *date;
 
        date    = new Date();
-       f_path  = get_store_file_name(device_id, date);
+       f_path  = get_file_name(device_id, date);
        ostream = W1Util::open_for_writing(f_path.c_str());
        // TODO: add mutex to protect string_list while it's read and emptied
        if (ostream != NULL) {
@@ -138,7 +138,7 @@ void W1Store::load() {
        if (in.is_open() == true) {
                while (in.eof() == false) {
                        getline(in, line);
-                       data    = W1Util::parse_data_line(line);
+                       data    = Data::parse_data_string(line);
                        if (store_data == NULL) {
                                store_data      = new DataRange(*data);
                        }
@@ -266,13 +266,13 @@ DataRange *W1Store::get_oldest_and_newest_data() {
                                getline(in, line);
                                if (line.empty() == false) {
                                        if (o_data == NULL) {
-                                               o_data  = W1Util::parse_data_line(line);
+                                               o_data  = Data::parse_data_string(line);
                                        }
                                        prev_line       = line;
                                }
                        }
                        if (prev_line.empty() == false) {
-                               n_data  = W1Util::parse_data_line(prev_line);
+                               n_data  = Data::parse_data_string(prev_line);
                        }
                }
        }