Improve amdaParameterInfo process (for #5637)

Benjamin Renard
1 parent 8bed959f
Showing 4 changed files with 28 additions and 5 deletions Show diff stats
src/TimeUtil/TimeUtil.cc
src/amdaParameterInfo/CMakeLists.txt
src/amdaParameterInfo/Main.cc
src/amdaParameterInfo/ParameterInfo.cc
@@ -35,7 +35,7 @@ void TimeUtil::formatTimeInIso(const double time, std::ostream&amp; pOs, t_DDTimeKin
  
 	   tm.times = time;
 	   SetIntNew(&tm, timeKind);
-	   if(tm.year % 4 == 0) visocos = 1; else visocos = 0;
+	   if (((tm.year & 3) == 0)&&(((tm.year % 100) != 0)||((tm.year % 400)==0))) visocos = 1; else visocos = 0;
 	   int month = 0;
 	   while((month < 12) && (tm.day >= monthday[visocos][month])) month++;
  
@@ -2,6 +2,7 @@
 PROJECT(amdaParameterInfo)
  
 include_directories(
+    ${CMAKE_HOME_DIRECTORY}/src/TimeUtil/
     ${CMAKE_HOME_DIRECTORY}/src/helpers/
     ${CMAKE_HOME_DIRECTORY}/src/Info/
     ${CMAKE_HOME_DIRECTORY}/src/Common/
@@ -12,6 +13,7 @@ include_directories(
     ${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}
@@ -29,6 +31,7 @@ ADD_EXECUTABLE( amdaParameterInfo ${source_files} )
  
 target_link_libraries(
 	amdaParameterInfo
+        TimeUtil
 	AMDA_COMMON
    	${CMAKE_THREAD_LIBS_INIT}
 	Parameters
@@ -17,6 +17,7 @@
 #include "Process.hh"
 #include "ParameterInfo.hh"
 #include "ServicesServer.hh"
+#include "TimeUtil.hh"
  
 using namespace std;
 namespace po = boost::program_options;
@@ -24,7 +25,7 @@ using namespace log4cxx;
 using namespace log4cxx::helpers;
 using namespace AMDA::Parameters;
  
-#define YEAR_3000_TIMESTAMP 32503680000
+#define MAX_YEAR 2040
  
 /**
  * Main function
@@ -70,7 +71,22 @@ int main(int argc, char *argv[]) {
 			///Create ParameterManager and configuration
 			ParameterManager parameterManager;
 			std::string emptyStr;
-                        parameterManager.addInputInterval(0,YEAR_3000_TIMESTAMP, 0, emptyStr, emptyStr, 0);
+			std::stringstream ss;
+			char startTimeIso[24];
+			char stopTimeIso[24];
+			memset(startTimeIso, 0, 24*sizeof(char));
+			memset(stopTimeIso, 0, 24*sizeof(char));
+
+			for (int y = 1970; y < MAX_YEAR; ++y) {
+				ss << std::setfill('0') << y << "-01-01T00:00:00.000";
+				memcpy(startTimeIso, ss.str().c_str(), 24*sizeof(char));
+				double startTime = AMDA::TimeUtil::readTimeInIso(startTimeIso);
+				ss.str("");
+				ss << std::setfill('0') << y << "-12-31T23:59:59.000";
+				memcpy(stopTimeIso, ss.str().c_str(), 24*sizeof(char));
+				double stopTime = AMDA::TimeUtil::readTimeInIso(stopTimeIso);
+				parameterManager.addInputInterval(startTime, stopTime, 0, emptyStr, emptyStr, 0);
+			}
  
 			if (!lProperties["app.param.gapthreshold"].empty())
 			{
@@ -161,14 +161,18 @@ void ParameterInfo::writeTable(boost::shared_ptr&lt;AMDA::Info::ParamTable&gt; tableSP
  
 void ParameterInfo::apply() {
     //Intervals loop
-    while (_currentTimeInterval != _timeIntervalList->end())
+    bool skip = false;
+    while (!skip && (_currentTimeInterval != _timeIntervalList->end()))
     {
         if (_currentTimeInterval->_stopTime - _currentTimeInterval->_startTime == 0) {
             ++_currentTimeInterval;
             continue;
         }
  
-        _parameterManager.getParameter(_parameter->getId())->getAsync(this).get();
+        ParamDataIndexInfo paramIndexInfo = _parameterManager.getParameter(_parameter->getId())->getAsync(this).get();
+        if (paramIndexInfo._nbDataToProcess > 0) {
+            skip = true;
+        }
  
         ++_currentTimeInterval;
     }