Changeset 431

Timestamp:

05/30/13 18:08:47 (11 years ago)

Author:

ymipsl

Message:

Bug fix : Solve problem in splitting date
Enhancement : Add file attribute split_freq_format to manage the suffix added in splitted file

Location:

XIOS/trunk/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• date.cpp (modified) (1 diff)
• date.hpp (modified) (1 diff)
• node/file.cpp (modified) (2 diffs)

XIOS/trunk/src/config/file_attribute.conf

@@ -9 +9 @@
 DECLARE_ATTRIBUTE(StdString, sync_freq)
 DECLARE_ATTRIBUTE(StdString, split_freq)
+DECLARE_ATTRIBUTE(StdString, split_freq_format)
 DECLARE_ATTRIBUTE(bool,      enabled)
 DECLARE_ENUM2(type,one_file,multiple_file)

XIOS/trunk/src/date.cpp

@@ -214 +214 @@
       }
       
-       StdString CDate::toString(void) const
+
+      string CDate::getStr(const string& str) const
+      {
+        ostringstream oss ;
+        int level;
+        
+        level=0 ;
+        for(string::const_iterator it=str.begin();it!=str.end();++it)
+        {
+          if (level==0)
+          {
+            if (*it=='%') level++ ;
+            else oss<<*it ;
+          }
+          else if (level==1)
+          {
+            switch (*it)
+            {
+              case 'y' :
+                oss.width (4);  oss.fill ('0') ; oss << year ;
+                level=0 ;
+                break ;
+              case 'm' : // month or minute
+                level++ ;
+                break ;
+              case 'd' :
+                oss.width (2);  oss.fill ('0') ; oss << day ;
+                level=0;
+                break ;
+              case 'h' :
+                oss.width (2);  oss.fill ('0') ; oss << hour ;
+                level=0;
+                break ;
+              case 's' :
+                oss.width (2);  oss.fill ('0') ; oss << second ;
+                level=0 ;
+                break;
+              default :
+                oss<<'%'<<*it ;
+                level=0 ;
+            }
+          }
+          else if (level==2)
+          {
+            switch (*it)
+            {
+              case 'o' : // month
+                oss.width (2);  oss.fill ('0') ; oss << month ;
+                level=0 ;
+                break ;
+              case 'i' : //minute
+                oss.width (2);  oss.fill ('0') ; oss << minute ;
+                level=0 ;
+                break ;
+              default :
+                oss<<"%m"<<*it ;
+                level=0 ;
+            }
+          }
+        }
+        return oss.str();
+      }
+      
+      StdString CDate::toString(void) const
       { 
          StdOStringStream oss;

XIOS/trunk/src/date.hpp

@@ -57 +57 @@
             StdString toString(void) const;
             StdString getStryyyymmdd(void) const;
+            string getStr(const string& str) const;
+
 
          public : /* static */

XIOS/trunk/src/node/file.cpp

@@ -207 +207 @@
       if (! split_freq.isEmpty())
       {
-        if (*lastSplit+splitFreq < currentDate)
+        if (currentDate > *lastSplit+splitFreq)
         {
-          *lastSplit=currentDate-outputFreq ;
-        
+          *lastSplit=*lastSplit+splitFreq ;    
           std::vector<CField*>::iterator it, end = this->enabledFields.end();
           for (it = this->enabledFields.begin() ;it != end; it++)  (*it)->resetNStep() ;
@@ -231 +230 @@
          oss << filename;
          if (!name_suffix.isEmpty()) oss << name_suffix.getValue();
-         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStryyyymmdd()<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStryyyymmdd();
+//         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStryyyymmdd()<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStryyyymmdd();
+//         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStr("%y_%mo_%d")<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStr("%y_%mo_%d");
+         if (!split_freq.isEmpty())
+         {
+           string splitFormat ;
+           if (split_freq_format.isEmpty())
+           {
+             if (splitFreq.second!=0) splitFormat="%y%mo%d%h%mi%s";
+             else if (splitFreq.minute!=0) splitFormat="%y%mo%d%h%mi";
+             else if (splitFreq.hour!=0) splitFormat="%y%mo%d%h";
+             else if (splitFreq.day!=0) splitFormat="%y%mo%d";
+             else if (splitFreq.month!=0) splitFormat="%y%mo";
+             else splitFormat="%y";
+           }
+           else splitFormat=split_freq_format ;
+           oss<<"_"<<lastSplit->getStr(splitFormat)<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStr(splitFormat);
+         }
+           
          bool multifile=true ;
          if (!type.isEmpty())