Changeset 875

Timestamp:

06/21/16 17:00:24 (8 years ago)

Author:

ymipsl

Message:

Improved format when activatin splitting.
The key %start_date% and %end_date% are analysed in the filename and substitutide by coresponding date.

%start_date% and %end_date% must appear at maximum once time each, if both are specifed, %start_date% must be specified before %end_date%.
When spliting is not activated, the substring beween %start_date% and %end_date% (including date) are not output.

YM

File:

• XIOS/trunk/src/node/file.cpp (modified) (2 diffs)

XIOS/trunk/src/node/file.cpp

@@ -357 +357 @@
       {
          StdString filename = getFileOutputName();
+         if (!name_suffix.isEmpty()) filename+=name_suffix.getValue();
+
+// determine splitting format in the file name  : firstPart%start_date%middlePart%end_date%lastPart
+
+         std::string strStartDate="%start_date%" ;
+         std::string strEndDate="%end_date%" ;
+
+         std::string firstPart ;
+         std::string middlePart ;
+         std::string lastPart ;
+         size_t pos1, pos2 ;
+         bool hasStartDate=false ;
+         bool hasEndDate=false ;   
+                  
+         pos1=filename.find(strStartDate) ;
+         if (pos1!=std::string::npos)
+         {
+           firstPart=filename.substr(0,pos1) ;
+           pos1+=strStartDate.size() ;
+           hasStartDate=true ;
+         }
+         else pos1=0 ;
+
+         pos2=filename.find(strEndDate,pos1) ;
+         if (pos2!=std::string::npos)
+         {
+           middlePart=filename.substr(pos1,pos2-pos1) ;
+           cout<<pos2<<endl ;
+           pos2+=strEndDate.size() ;
+           lastPart=filename.substr(pos2,filename.size()-pos2) ;
+           hasEndDate=true ;
+         }
+         else middlePart=filename.substr(pos1,filename.size()) ;
+
+         if (!hasStartDate && !hasEndDate)
+         {
+           hasStartDate=true ;
+           hasEndDate=true;
+           firstPart=middlePart ;
+           middlePart="-" ;
+         }
+//   
+         cout<<"filename : "<<filename<<"  firstPart : "<<firstPart<<"  middlePart : "<<middlePart<<"  lastPart : "<<lastPart<<endl ;  
+         cout<<" hasStartDate : "<<hasStartDate<<"  hasEndDate :"<<hasEndDate ;
          StdOStringStream oss;
-         oss << filename;
-         if (!name_suffix.isEmpty()) oss << name_suffix.getValue();
 
          if (!split_freq.isEmpty())
@@ -377 +419 @@
            else splitFormat = split_freq_format;
 
-           oss << "_" << lastSplit.getStr(splitFormat) << "-" << splitEnd.getStr(splitFormat);
+           oss << firstPart ;
+           if (hasStartDate) oss << lastSplit.getStr(splitFormat) ;
+           oss << middlePart ;
+           if (hasEndDate) oss << splitEnd.getStr(splitFormat);
+           oss << lastPart ;
 
            context->registryOut->setKey("splitStart", lastSplit);
            context->registryOut->setKey("splitEnd",   splitEnd);
          }
+         else oss<<firstPart<<lastPart ;
 
         bool append = !this->append.isEmpty() && this->append.getValue();