Generate DAS2 data sources list

Benjamin Renard
1 parent c01c26d9
Showing 9 changed files with 176 additions and 51 deletions Show diff stats
CMakeLists.txt
src/ParamGetImpl/DAS2Interface/AMDAPlugin.cc
src/ParamGetImpl/DAS2Interface/DAS2Server.cc
src/ParamGetImpl/DAS2Interface/DAS2Server.hh
src/ParamGetImpl/DAS2Interface/DAS2ServerManager.cc
src/ParamGetImpl/DAS2Interface/DAS2ServerManager.hh
src/ParamGetImpl/DAS2Interface/ParamGetDAS2.cc
src/das2GetListDataSourcesForAmda/CMakeLists.txt
src/das2GetListDataSourcesForAmda/Main.cc
@@ -199,6 +199,7 @@ add_subdirectory(src/ExternLib/Tetrahedron/elongation)
 add_subdirectory(src/ExternLib/Tetrahedron/planarity)
 add_subdirectory(src/ExternLib/Tetrahedron/characteristic)
 add_subdirectory(src/ExternLib/gtl_lepb_calculate)
+add_subdirectory(src/das2GetListDataSourcesForAmda)
  
 IF ( CSLIM_FOUND )
     add_subdirectory(test/DD_Client/CSlimFixtures)
@@ -27,6 +27,7 @@
 #include "ParamGetDAS2.hh"
 #include "GetDAS2Node.hh"
 #include "ProcessDAS2GetTable.hh"
+#include "DAS2ServerManager.hh"
  
 using namespace AMDA::Parameters;
 using namespace AMDA::XMLParameterConfigurator;
@@ -62,6 +63,10 @@ using namespace AMDA::XMLParameterConfigurator;
 		ProcessFactory das2GetTableProcess = boost::factory<AMDA::DAS2Interface::ProcessDAS2GetTable*>();
     	ServicesServer::getInstance()->addProcessFactory("das2_get_table", das2GetTableProcess);
 	    ServicesServer::getInstance()->linkProcessWithPlugin("das2_get_table", pm.getCurrentPluginPath());
+
+        std::cout << "BRE - das2_list_data_sources" << std::endl;
+        ServicesServer::getInstance()->addServiceImpl<AMDA::DAS2Interface::DAS2ListDataSourcesProcess>("das2_list_data_sources", &AMDA::DAS2Interface::generateDAS2ListDataSourcesForAmda);
+        ServicesServer::getInstance()->linkProcessWithPlugin("das2_list_data_sources", pm.getCurrentPluginPath());
 	}
  
 	extern "C" void unregisterPlugin()
@@ -187,7 +187,7 @@ bool DAS2Tree::writeToXMLFile(std::string&amp; filePath, std::string&amp; dataCenterName
 	if (writer == NULL) {
 		return false;
 	}
-
+    xmlTextWriterSetIndent(writer, 1);
 	int rc;
 	rc = xmlTextWriterStartDocument(writer, "1.0", "UTF-8", NULL);
  
@@ -196,12 +196,6 @@ bool DAS2Tree::writeToXMLFile(std::string&amp; filePath, std::string&amp; dataCenterName
 		return false;
 	}
  
-/*
-<dataRoot xml:id="myRemoteData-treeRootNode">
-  <dataCenter xml:id="MASER" name="MASER" url="https://voparis-das-maser.obspm.fr/das2/server">
-
-*/
-
 	rc = xmlTextWriterStartElement(writer, BAD_CAST "dataRoot");
 	if (rc < 0) {
 		xmlFreeTextWriter(writer);
@@ -280,53 +274,15 @@ DAS2DatasetSPtr&amp; DAS2Server::getDataset(std::string&amp; pId) {
 	return _datasetMap[pId];
 }
  
-DAS2Tree DAS2Server::getListDataSources() {
+DAS2Tree DAS2Server::getListDataSources(std::string& baseName) {
 	std::string url = _url;
     url += "?server=list";
 	std::string listSources = DAS2CWrapper::getListDataSources(url);
 	DAS2Tree tree(listSources);
-	std::string filePath = "/home/amda_admin/AMDA/AMDA_Kernel/app-debug/base.xml";
-	std::string baseName = "MASER";
+	std::string filePath = baseName;
+    filePath += "_";
+    filePath += "base.xml";
 	tree.writeToXMLFile(filePath, baseName, _url);
-	/*std::istringstream lines(listSources.c_str());
-    std::string line;
-    while (std::getline(lines, line)) {
-		boost::algorithm::trim(line);
-		if (line.empty())
-			continue;
-        std::vector<std::string> parts;
-		boost::split(parts, line, [](char c){return c == '|';});
-		std::string path = "";
-		std::string description = "";
-		if (parts.size() == 1) {
-			path = parts[0];
-		}
-		else if (parts.size() == 2) {
-			path = parts[0];
-			description = parts[1];
-			
-		}
-		else
-			continue;
-		bool isLeaf = path.back() != '/';
-		if (isLeaf) {
-			std::cout << "BRE - " << path << std::endl;
-			DAS2ParamInfo paramInfo;
-			if (!this->getDataset(path)->getDSDFInfo(paramInfo) || 
-				!this->getDataset(path)->getDataInfo(paramInfo)) {
-					continue;
-			}
-			std::cout << "BRE => " << paramInfo.label << std::endl;
-		}
-		parts.clear();
-		boost::split(parts, path, [](char c){return c == '/';});
-		std::string currentPath = "";
-		for (std::vector<std::string>::iterator it = parts.begin(); it != parts.end(); ++it) {
-			if (!currentPath.empty())
-				currentPath += "/";
-			currentPath += *it;
-		}	
-    }*/
 	return tree;
 }
  
@@ -68,7 +68,7 @@ public:
  
 	DAS2DatasetSPtr& getDataset(std::string& pId);
  
-	DAS2Tree getListDataSources();
+	DAS2Tree getListDataSources(std::string& baseName);
  
 private:
 	std::string _url;
@@ -25,5 +25,10 @@ namespace AMDA {
 			} 
 			return _das2ServerMap[pURL];
 		}
+
+        bool generateDAS2ListDataSourcesForAmda(std::string& centerName, std::string& url) {
+            AMDA::DAS2Interface::DAS2ServerSPtr server = AMDA::DAS2Interface::DAS2ServerManager::getInstance()->getServer(url);
+            server->getListDataSources(centerName);
+        }
 	} /* namespace DAS2Interface */
 } /* namespace AMDA */
@@ -25,6 +25,7 @@ namespace AMDA {
 		public:
  
 			typedef std::map<std::string,DAS2ServerSPtr> DAS2ServerMap;
+            
  
 			// Design pattern
 			friend class Singleton<DAS2ServerManager>;
@@ -42,6 +43,9 @@ namespace AMDA {
 			DAS2ServerMap _das2ServerMap;
 		};
  
+        typedef bool (*DAS2ListDataSourcesProcess)(std::string&, std::string&);
+        bool generateDAS2ListDataSourcesForAmda(std::string& centerName, std::string& url);
+
 	} /* namespace DAS2Interface */
 } /* namespace AMDA */
 #endif /* DAS2SERVERMANAGER_HH_ */
@@ -52,7 +52,7 @@ TimeStamp ParamGetDAS2::init()
 {
 	LOG4CXX_DEBUG(gLogger, "ParamGetDAS2::init");
  
-	_datasetSPtr->getServer()->getListDataSources();
+	//_datasetSPtr->getServer()->getListDataSources();
  
 	if (!_datasetSPtr->getDSDFInfo(_paramInfo)) {
 		BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_ERROR_UNKNOWN) << AMDA::ex_msg(std::string("Cannot retrieve DSDF")));
@@ -0,0 +1,48 @@
+
+PROJECT(das2GetListDataSourcesForAmda)
+
+include_directories(
+    ${CMAKE_HOME_DIRECTORY}/src/TimeUtil/
+    ${CMAKE_HOME_DIRECTORY}/src/helpers/
+    ${CMAKE_HOME_DIRECTORY}/src/Info/
+    ${CMAKE_HOME_DIRECTORY}/src/Common/
+    ${CMAKE_HOME_DIRECTORY}/src/Parameters/
+    ${CMAKE_HOME_DIRECTORY}/src/PostProcessing/
+    ${CMAKE_HOME_DIRECTORY}/src/XMLConfigurator/
+    ${CMAKE_HOME_DIRECTORY}/src/XMLParameterConfigurator/
+    ${CMAKE_HOME_DIRECTORY}/src/Plugins/
+    ${CMAKE_HOME_DIRECTORY}/src/TimeTableCatalog/
+    ${CMAKE_HOME_DIRECTORY}/src/SpiceKernel/
+    ${DDCLIENTINCLUDE_DIR}
+    ${LOG4CXX_INCLUDE_DIR}
+    ${LIBXML2_INCLUDE_DIR}
+    ${Boost_INCLUDE_DIR}
+)
+
+#Configuration de la librairie
+file(
+	GLOB_RECURSE
+	source_files
+	./*
+)
+
+ADD_EXECUTABLE( das2GetListDataSourcesForAmda ${source_files} )
+
+
+target_link_libraries(
+	das2GetListDataSourcesForAmda
+        TimeUtil
+	AMDA_COMMON
+   	${CMAKE_THREAD_LIBS_INIT}
+	Parameters
+	${LOG4CXX_LIBRARIES}
+	${LIBXML2_LIBRARIES}
+	${Boost_LIBRARIES}
+	Plugin
+	XMLParameterConfigurator
+	ParamOutputImpl
+	TimeTableCatalog
+	Info
+	SpiceKernel
+	${DDCLIENTLIBRARY}
+)
@@ -0,0 +1,106 @@
+/**
+ * Main.cc
+ *  Created on: 18 mar. 2016
+ *      Author: AKKA IS
+ */
+
+#include <iostream>
+
+#include <boost/program_options.hpp>
+
+#include "AMDA-Kernel_Config.hh"
+#include <Application.hh>
+
+// Parameters module include
+#include "ParameterManager.hh"
+#include "Parameter.hh"
+#include "ParamGet.hh"
+#include "Process.hh"
+#include "ServicesServer.hh"
+#include "TimeUtil.hh"
+
+using namespace std;
+namespace po = boost::program_options;
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+using namespace AMDA::Parameters;
+
+
+typedef bool (*DAS2ListDataSourcesProcess)(std::string&, std::string&);
+
+/**
+ * Main function
+ */
+int main(int argc, char *argv[]) {
+	int result = AMDA_EXIT_OK;
+
+	/// Parse command line parameters
+	po::options_description desc("Allowed options");
+
+	desc.add_options()
+		("help,h", "Produce help message")
+		("version,v", "Program version")
+		("center,c", po::value< string >(), "Center name")
+        ("url,u", po::value< string >(), "DAS2 entry point")
+	;
+
+	po::positional_options_description c, u;
+	c.add("center", -1);
+    u.add("url", -1);
+
+    std::cout << "BRE - A" << std::endl;
+
+	po::variables_map vm;
+	po::store(po::command_line_parser(argc, argv).options(desc).positional(c).positional(u).run(), vm);
+	po::notify(vm);
+
+    std::cout << "BRE - B" << std::endl;
+
+	if (vm.count("help")) {
+		cout << desc << "\n";
+		return result;
+	}
+
+    std::cout << "BRE - C" << std::endl;
+	if (vm.count("version")) {
+		cout << "Version: " << AMDA_Kernel_VERSION << "\n";
+		return result;
+	}
+
+    std::cout << "BRE - D" << std::endl;
+	if (!vm.count("center")) {
+		return result;
+	}
+
+    std::cout << "BRE - E" << std::endl;
+	if (!vm.count("url")) {
+		return result;
+	}
+
+    std::cout << "BRE - F" << std::endl;
+
+	AMDA::Common::Application lMain;
+
+	return lMain.main(argc,argv,[&](int , char **, AMDA::helpers::Properties& lProperties) -> int {
+
+        std::cout << "BRE - G" << std::endl;
+
+			string centerName = vm["center"].as< string >();
+            string url = vm["url"].as< string >();
+
+            ServicesServer *servicesServer = ServicesServer::getInstance();
+
+            std::cout << "BRE - H" << std::endl;
+
+            DAS2ListDataSourcesProcess list_data_sources = servicesServer->getService<DAS2ListDataSourcesProcess>("das2_list_data_sources");
+
+            std::cout << "BRE - I" << std::endl;
+            list_data_sources(centerName, url);
+
+            std::cout << "BRE - " << list_data_sources << std::endl;
+
+			return result;
+});
+
+}
+