Changeset 1090 for XIOS

Timestamp:

04/12/17 17:39:10 (7 years ago)

Author:

ymipsl

Message:

Bug fix in append mode when file are split with different period.
-> informations in registry contains now the file names.
(Untested currently)

YM

Location:

XIOS/trunk/src/node

Files:

• file.cpp (modified) (5 diffs)
• file.hpp (modified) (1 diff)

XIOS/trunk/src/node/file.cpp

@@ -50 +50 @@
    //----------------------------------------------------------------
 
-   const StdString& CFile::getFileOutputName(void) const
-   {
-     return name.isEmpty() ? getId() : name;
+   const StdString CFile::getFileOutputName(void) const
+   {
+     return (name.isEmpty() ? getId() : name) + (name_suffix.isEmpty() ? StdString("") :  name_suffix.getValue());
    }
 
@@ -216 +216 @@
       if (!split_freq.isEmpty())
       {
-        if (context->registryIn->foundKey("splitStart") && context->registryIn->foundKey("splitEnd"))
+        StdString keySuffix("CContext_"+CContext::getCurrent()->getId()+"::CFile_"+getFileOutputName()+"::") ; 
+        if (context->registryIn->foundKey(keySuffix+"splitStart") && context->registryIn->foundKey(keySuffix+"splitEnd"))
         {
           CDate savedSplitStart(*context->getCalendar()), savedSplitEnd(*context->getCalendar());
@@ -348 +349 @@
       {
          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
@@ -415 +415 @@
            oss << lastPart ;
 
-           context->registryOut->setKey("splitStart", lastSplit);
-           context->registryOut->setKey("splitEnd",   splitEnd);
+           StdString keySuffix("CContext_"+CContext::getCurrent()->getId()+"::CFile_"+getFileOutputName()+"::") ; 
+           context->registryOut->setKey(keySuffix+"splitStart", lastSplit);
+           context->registryOut->setKey(keySuffix+"splitEnd",   splitEnd);
          }
          else oss<<firstPart<<lastPart ;
@@ -508 +509 @@
       StdOStringStream oss;
       oss << filename;
-      if (!name_suffix.isEmpty()) oss << name_suffix.getValue();
 
       if (!split_freq.isEmpty())

XIOS/trunk/src/node/file.hpp

@@ -69 +69 @@
       public:
          /// Accesseurs ///
-         const StdString& getFileOutputName(void) const;
+         const StdString getFileOutputName(void) const;
          boost::shared_ptr<CDataOutput> getDataOutput(void) const;
          boost::shared_ptr<CDataInput> getDataInput(void) const;