X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1Store.cc;h=fda285e540c0e6b13dcf3ca56f185410af86578d;hb=83dba70b46600014932da34e8744ba70584077aa;hp=80dde72388e325635b26abfda9455bf19d96ebea;hpb=9c47855d3ddc3d09b9733c43d420a7d5b739bd37;p=lib1wire.git

diff --git a/src/W1Store.cc b/src/W1Store.cc
index 80dde72..fda285e 100644
--- a/src/W1Store.cc
+++ b/src/W1Store.cc
@@ -27,8 +27,6 @@ using namespace std;
 using namespace w1;
 using namespace plp;
 
-std::string W1Store::store_base_dir	= DEFAULT_STORAGE_BASE_DIR;
-
 W1Store::W1Store(string device_id,
 		Date *date_time) {
 	store_data	= NULL;
@@ -50,30 +48,14 @@ W1Store::~W1Store() {
 	}
 }
 
-void W1Store::set_base_dir_name(string store_param) {
-	int	pos;
-	int	b_count;
-
-	pos	= store_param.find_last_of("/");
-	b_count	= store_param.length();
-	if (pos == (b_count - 1)) {
-		store_base_dir	= store_param;
-	}
-	else {
-		store_base_dir	= store_param + "/";
-	}
-}
-
-string W1Store::get_base_dir_name() {
-	return store_base_dir;
-}
-
 string W1Store::get_dir_name(string device_id, Date *date_time) {
 	string	ret_val;
 	char	buffer[30];
+	string  d_name;
 
+	d_name	= DeviceConfig::get_base_dir_name();
 	snprintf(buffer, 30, "%d/%02d", date_time->year, date_time->month);
-	ret_val	= W1Util::concat_paths(store_base_dir, device_id);
+	ret_val	= W1Util::concat_paths(d_name, device_id);
 	ret_val	= ret_val + "/" + buffer;
 	return ret_val;
 }
@@ -157,7 +139,6 @@ Data *W1Store::get_sum() {
 	double	new_val;
 	int	ii;
 	int	jj;
-	Date	*date;
 	Data	*data;
 	Data	*ret_val;
 
@@ -260,7 +241,6 @@ Data *W1Store::get_max() {
 	double	new_val;
 	int	ii;
 	int	jj;
-	Date	*date;
 	Data	*data;
 	Data	*ret_val;
 	double	min_val;
@@ -308,7 +288,6 @@ Data *W1Store::get_min() {
 	double	new_val;
 	int	ii;
 	int	jj;
-	Date	*date;
 	Data	*data;
 	Data	*ret_val;
 	double	max_val;
@@ -414,7 +393,6 @@ DataRange *W1Store::get_oldest_and_newest_data() {
 
 Data *W1Store::get_oldest_data() {
 	int		row_count;
-	int		col_count;
 	Data		*ret_val;
 	DataRange	*dr;
 
@@ -432,7 +410,6 @@ Data *W1Store::get_oldest_data() {
 
 Data *W1Store::get_newest_data() {
 	int		row_count;
-	int		col_count;
 	Data		*ret_val;
 	DataRange	*dr;