Refactoring and fixes.

[lib1wire.git] / src / W1CounterDevice.cc

diff --git a/src/W1CounterDevice.cc b/src/W1CounterDevice.cc
index d4a20f69de840644343d6d7c7bdad809506cb975..3ebdbd47c50ae61404d5f5e15b74e5809d79321c 100644 (file)
--- a/src/W1CounterDevice.cc
+++ b/src/W1CounterDevice.cc
@@ -7,12 +7,25 @@
 
 #include <iostream>
 #include <fstream>
+#include <sstream>
+#include <iomanip>
+
+#include <vector>
 
 #include "W1CounterDevice.hh"
 
 using namespace std;
 using namespace w1;
 
+template <class NumberDataType>
+bool string_to_number(NumberDataType& result,
+                 const std::string& string_param,
+                 std::ios_base& (*format)(std::ios_base&))
+{
+       std::istringstream iss(string_param);
+       return !(iss >> format >> result).fail();
+}
+
 W1CounterDevice::W1CounterDevice(int family_code_param,
                                string device_id_param,
                                dirent *direntry_param): W1Device(family_code_param, device_id_param, direntry_param) {
@@ -31,7 +44,7 @@ W1CounterDevice::~W1CounterDevice() {
        // TODO Auto-generated destructor stub
 }
 
-bool W1CounterDevice::is_supported_family_code(int family_code) {
+bool W1CounterDevice::is_supported_w1_family_code(int family_code) {
        bool    ret_val;
 
        ret_val = false;
@@ -43,37 +56,30 @@ bool W1CounterDevice::is_supported_family_code(int family_code) {
        return ret_val;
 }
 
-string W1CounterDevice::get_raw_data() {
-       string  ret_val;
-       string  value_line;
-       int     pos;
-       int     length;
+vector<double> *W1CounterDevice::get_raw_data() {
+       int             pos;
+       int             b_cnt;
+       string          val_str;
+       int             val_dbl;
+       vector<double>  *ret_val;
 
-       ret_val = "<could not read>";
+       ret_val = NULL;
        ifstream ifs(slave_file.c_str());
        if (ifs.is_open() == true) {
-               ret_val = "";
-               while(getline(ifs, value_line)) {
-                       length  = value_line.length();
-                       if (length > 0) {
-                               pos     = value_line.find("crc=YES c=");
+               while(getline(ifs, val_str)) {
+                       b_cnt   = val_str.length();
+                       if (b_cnt > 0) {
+                               pos     = val_str.find("crc=YES c=");
                                if ((pos >= 0) &&
-                                   (pos + 10 < length)) {
-                                       value_line      = value_line.substr(pos + 10);
-                               }
-                               else {
-                                       value_line      = "";
+                                   ((pos + 10) < b_cnt)) {
+                                       if (ret_val == NULL) {
+                                               ret_val = new vector<double>();
+                                       }
+                                       val_str = val_str.substr(pos + 10);
+                                       string_to_number<int>(val_dbl, val_str, dec);
+                                       ret_val->push_back(val_dbl);
                                }
                        }
-                       else {
-                               value_line      = "";
-                       }
-                       if (ret_val.length() == 0) {
-                               ret_val = value_line;
-                       }
-                       else {
-                               ret_val = ret_val + "|" + value_line;
-                       }
                }
                ifs.close();
        }