From f118b029ff73dc23989c5b648cd6175b968a9a14 Mon Sep 17 00:00:00 2001
From: astri <astri@RedHat-7.myguest.virtualbox.org>
Date: Thu, 18 May 2023 19:20:08 +0200
Subject: [PATCH 1/4] refactoring configuration

---
 include/Base_Configurator.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/Base_Configurator.h b/include/Base_Configurator.h
index 0ba8672..d7c2f91 100644
--- a/include/Base_Configurator.h
+++ b/include/Base_Configurator.h
@@ -1,21 +1,21 @@
-#ifndef BASECONFIGURATOR_H_
-#define BASECONFIGURATOR_H_
+#pragma once
 
 #include <map>
 #include <string>
 
+namespace inaf::oasbo::Configurators {
 
 class BaseConfigurator{
 protected:
-	std::map<std::string,std::string> params;
+	std::map<std::string,std::string> config;
 
 public:
-	std::map<std::string,std::string>getParams(){return params;}
-	void setParams(std::map<std::string,std::string> params){this->params = params;}
+	virtual std::map<std::string, std::string> readConfig() = 0;
+	virtual void updateConfig(std::map<std::string, std::string>) = 0;
 
 	std::string toString(){
 		std::string ret = "";
-		for( const std::pair<std::string, std::string> n : params) {
+		for( const std::pair<std::string, std::string> n : config) {
 			ret += n.first + " : " + n.second + "\n";
 		}
 		return ret;
@@ -24,5 +24,4 @@ public:
 	virtual ~BaseConfigurator() = default;
 
 };
-
-#endif /* BASECONFIGURATOR_H_ */
+}
-- 
GitLab


From c3999c142d3630743fa91b4dcedbf1d2eeb32e1c Mon Sep 17 00:00:00 2001
From: astri <astri@RedHat-7.myguest.virtualbox.org>
Date: Thu, 25 May 2023 16:00:02 +0200
Subject: [PATCH 2/4] boh

---
 include/Base_DAQ.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/Base_DAQ.h b/include/Base_DAQ.h
index d66bb1b..efd7f9e 100755
--- a/include/Base_DAQ.h
+++ b/include/Base_DAQ.h
@@ -24,7 +24,7 @@ protected:
 	Status currentState;
 	Status nextState;
 	bool changeStateFlag = false;
-	ConnectionProtocols::BaseProtocol *socket = nullptr;
+	ConnectionProtocols::BaseProtocol *protocol = nullptr;
 	Archivers::BaseArchiver *archiver = nullptr;
 	Providers::BaseProvider *provider = nullptr;
 	PacketMonitors::BasePacketMonitor *monitor = nullptr;
@@ -33,7 +33,7 @@ protected:
 
 public:
 	void setProtocol(ConnectionProtocols::BaseProtocol &socket) {
-		this->socket = &socket;
+		this->protocol = &socket;
 	}
 	void setArchiver(Archivers::BaseArchiver &archiver) {
 		this->archiver = &archiver;
@@ -67,7 +67,7 @@ public:
 	}
 
 	ConnectionProtocols::BaseProtocol* getSocketPtr() {
-		return this->socket;
+		return this->protocol;
 	}
 	Archivers::BaseArchiver* getArchiverPtr() {
 		return this->archiver;
@@ -97,7 +97,7 @@ public:
 	virtual int deliverPacket() = 0;
 
 	virtual ~BaseDAQ() {
-		delete socket;
+		delete protocol;
 		delete provider;
 		delete archiver;
 		delete monitor;
-- 
GitLab


From 2b4e8b039ec5da9ddd53720991c1b95f034e86fb Mon Sep 17 00:00:00 2001
From: astri <astri@RedHat-7.myguest.virtualbox.org>
Date: Sat, 3 Jun 2023 13:42:27 +0200
Subject: [PATCH 3/4] update base conf

---
 include/Base_Configurator.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/Base_Configurator.h b/include/Base_Configurator.h
index d7c2f91..72f4c23 100644
--- a/include/Base_Configurator.h
+++ b/include/Base_Configurator.h
@@ -10,8 +10,12 @@ protected:
 	std::map<std::string,std::string> config;
 
 public:
-	virtual std::map<std::string, std::string> readConfig() = 0;
-	virtual void updateConfig(std::map<std::string, std::string>) = 0;
+	virtual int readConfigFromSource() = 0;
+	virtual int readConfigFromSource(std::string target) = 0;
+	virtual int pushConfigToSource() = 0;
+	virtual int pushConfigToSource(std::string target) = 0;
+	virtual int insert(std::map<std::string, std::string>, std::string target);
+	virtual std::map<std::string, std::string> getConfig() {return this->config;}
 
 	std::string toString(){
 		std::string ret = "";
-- 
GitLab


From 22796b5d923bea6fe20da3f1140dfb46c86b282e Mon Sep 17 00:00:00 2001
From: Valerio Pastore <valerio.pastore@inaf.it>
Date: Sat, 3 Jun 2023 17:16:03 +0000
Subject: [PATCH 4/4] Update Base_Configurator.h

---
 include/Base_Configurator.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Base_Configurator.h b/include/Base_Configurator.h
index 72f4c23..97b46e9 100644
--- a/include/Base_Configurator.h
+++ b/include/Base_Configurator.h
@@ -14,7 +14,7 @@ public:
 	virtual int readConfigFromSource(std::string target) = 0;
 	virtual int pushConfigToSource() = 0;
 	virtual int pushConfigToSource(std::string target) = 0;
-	virtual int insert(std::map<std::string, std::string>, std::string target);
+	virtual int insert(std::map<std::string, std::string>, std::string target) = 0;
 	virtual std::map<std::string, std::string> getConfig() {return this->config;}
 
 	std::string toString(){
-- 
GitLab