api fixes and cleanups

[libplp.git] / src / DataReader.cc

diff --git a/src/DataReader.cc b/src/DataReader.cc
index 00f861a61dc116907712e6e8bb10ac7c52ca4492..00fc1f4da9f1d0462eb5bf77acc9fc4949951fc8 100644 (file)
--- a/src/DataReader.cc
+++ b/src/DataReader.cc
@@ -35,12 +35,13 @@ DataReader::DataReader(string device_id_param) {
        string  base_dir;
 
        log_debug("device_id: %s\n", device_id_param.c_str());
-       device_config   = NULL;
-       device_id       = device_id_param;
-       base_dir        = DeviceConfig::get_base_dir_name();
-       device_dir      = FileUtil::concat_paths(base_dir, device_id);
-       device_ch_dir   = FileUtil::concat_paths(base_dir, "cache");
-       device_ch_dir   = FileUtil::concat_paths(device_ch_dir, device_id);
+       summary_calc_type       = MEAN;
+       device_config           = NULL;
+       device_id               = device_id_param;
+       base_dir                = DeviceConfig::get_base_dir_name();
+       device_dir              = FileUtil::concat_paths(base_dir, device_id);
+       device_ch_dir           = FileUtil::concat_paths(base_dir, "cache");
+       device_ch_dir           = FileUtil::concat_paths(device_ch_dir, device_id);
 }
 
 DataReader::~DataReader() {
@@ -447,14 +448,15 @@ string DataReader::get_device_id() {
  * @rerurn string representing device type.
  * In the case of error, an empty string is returned.
  */
-string DataReader::get_device_type() {
-       string  ret_val;
+bool DataReader::get_device_type(string& type_param) {
+       bool    ret_val;
 
+       ret_val = false;
        if (device_config == NULL) {
                device_config   = DeviceConfig::get_device_config(device_id);
        }
        if (device_config != NULL) {
-               ret_val = device_config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE);
+               ret_val = device_config->get_config_value(DEVICE_CONFIG_VALUE_KEY__TYPE, type_param);
        }
        return ret_val;
 }