Changeset 1189

Timestamp:

06/30/17 16:22:31 (7 years ago)

Author:

ymipsl

Message:

Add new attribute to manage splitting in file name :

• split_start_offset (duration) : add an offset to the start splitting date in the file name
• split_end_offset (duration) : add an offset to the end splitting date in the file name
• split_last_date (date) : the end splitting be replace by split_last_date if greather than.

YM

Location:

XIOS/trunk/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• node/file.cpp (modified) (3 diffs)

XIOS/trunk/src/config/file_attribute.conf

@@ -10 +10 @@
 DECLARE_ATTRIBUTE(CDuration, split_freq)
 DECLARE_ATTRIBUTE(StdString, split_freq_format)
+DECLARE_ATTRIBUTE(CDuration, split_start_offset)
+DECLARE_ATTRIBUTE(CDuration, split_end_offset)
+DECLARE_ATTRIBUTE(string,     split_last_date)
 DECLARE_ATTRIBUTE(bool,      enabled)
 DECLARE_ENUM2(type,          one_file, multiple_file)

XIOS/trunk/src/node/file.cpp

@@ -400 +400 @@
          if (!split_freq.isEmpty())
          {
-           CDate splitEnd = lastSplit + split_freq - 1 * Second;
+           CDate split_start ;
+           CDate splitEnd ;
+           if (!split_start_offset.isEmpty()) split_start=lastSplit + split_start_offset ;
+           else split_start=lastSplit ;
+
+           splitEnd = lastSplit + split_freq ;
+           if (!split_last_date.isEmpty())
+           {
+             CDate splitLastDate=CDate::FromString(split_last_date,*CContext::getCurrent()->getCalendar()) ;
+             if( splitLastDate < splitEnd)  splitEnd=splitLastDate ;
+           }
+            
+           if (!split_end_offset.isEmpty()) splitEnd = splitEnd + split_end_offset;
+           else splitEnd = splitEnd - 1 * Second;
 
            string splitFormat;
@@ -415 +428 @@
 
            oss << firstPart ;
-           if (hasStartDate) oss << lastSplit.getStr(splitFormat) ;
+           if (hasStartDate) oss << split_start.getStr(splitFormat) ;
            oss << middlePart ;
            if (hasEndDate) oss << splitEnd.getStr(splitFormat);
@@ -421 +434 @@
 
            StdString keySuffix("CContext_"+CContext::getCurrent()->getId()+"::CFile_"+getFileOutputName()+"::") ; 
-           context->registryOut->setKey(keySuffix+"splitStart", lastSplit);
+           context->registryOut->setKey(keySuffix+"splitStart", split_start);
            context->registryOut->setKey(keySuffix+"splitEnd",   splitEnd);
          }