Commit 3e19e9d5d76dca08b4b56ace2831cd8dc18e4be0
1 parent
e4be1bd4
Exists in
master
and in
85 other branches
completly vriable parameteres seems ok
Showing
1 changed file
with
18 additions
and
2 deletions
Show diff stats
src/ParamOutputImpl/Download/DownloadOutput.cc
... | ... | @@ -11,6 +11,7 @@ |
11 | 11 | #include "FileWriterASCIIVOTable.hh" |
12 | 12 | #include "FileWriterCDF.hh" |
13 | 13 | #include "Helper.hh" |
14 | +#include "Process.hh" | |
14 | 15 | #include "Properties.hh" |
15 | 16 | #include "TimeUtil.hh" |
16 | 17 | #include "AMDA-Kernel_Config.hh" |
... | ... | @@ -82,7 +83,7 @@ void DownloadOutput::establishConnection() |
82 | 83 | |
83 | 84 | AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(paramProperties->getOriginalId()); |
84 | 85 | // adding tableParams |
85 | - std::map<int, boost::shared_ptr<AMDA::Info::ParamTable>> tables =paramInfo->getTables(); | |
86 | + std::map<int, boost::shared_ptr<AMDA::Info::ParamTable>> tables =paramInfo->getTables(); | |
86 | 87 | if(! tables.empty()){ |
87 | 88 | for(auto table : tables){ |
88 | 89 | if(table.second != nullptr){ |
... | ... | @@ -92,12 +93,27 @@ void DownloadOutput::establishConnection() |
92 | 93 | for(auto tableParamId : tableParamIds){ |
93 | 94 | AMDA::Parameters::ParameterSPtr tableParam = _parameterManager.getParameter(tableParamId.second); |
94 | 95 | tableParam ->openConnection(this); |
96 | + //chek if is a temporel serie than add it to downlowd (as dowlonded parameter) | |
97 | + // use addParameterInFile | |
98 | + AMDA::Parameters::Process* lProcess = dynamic_cast<AMDA::Parameters::Process*>(tableParam->getDataWriterTemplate().get()); | |
99 | + std::list<std::string>clbList; | |
100 | + if( lProcess != NULL){ | |
101 | + clbList= lProcess->getUsedClbInfo(); | |
102 | + } | |
103 | + if(lProcess == NULL && clbList.empty() ){ | |
104 | + ParamProperties* paramProperties = new ParamProperties(); | |
105 | + paramProperties->setOriginalId(tableParamId.second); | |
106 | + paramProperties->setOutputId(tableParamId.second); | |
107 | + _downloadProperties.addParamProperties(paramProperties); | |
108 | + } | |
109 | + } | |
110 | + | |
95 | 111 | } |
96 | 112 | } |
97 | 113 | |
98 | 114 | } |
99 | 115 | } |
100 | - } | |
116 | + | |
101 | 117 | |
102 | 118 | } catch (...) { |
103 | 119 | LOG4CXX_ERROR(_logger, "DownloadOutput::establishConnection - It's impossible to open connection for " << paramProperties->getOutputId()); | ... | ... |