Changeset 773 for XIOS/trunk/src/node

Timestamp:

10/30/15 16:33:49 (8 years ago)

Author:

rlacroix

Message:

File/Variable?: Add an helper function to get the output name.

Location:

XIOS/trunk/src/node

Files:

• context.cpp (modified) (1 diff)
• file.cpp (modified) (3 diffs)
• file.hpp (modified) (1 diff)
• variable.cpp (modified) (1 diff)
• variable.hpp (modified) (1 diff)

XIOS/trunk/src/node/context.cpp

@@ -921 +921 @@
        if (!file->timeseries.isEmpty() && file->timeseries != CFile::timeseries_attr::none)
        {
-         StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : (!file->name.isEmpty() ? file->name : file->getId());
+         StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : file->getFileOutputName();
 
          const std::vector<CField*> allFields = file->getAllFields();

XIOS/trunk/src/node/file.cpp

@@ -47 +47 @@
 
    //----------------------------------------------------------------
+
+   const StdString& CFile::getFileOutputName(void) const
+   {
+     return name.isEmpty() ? getId() : name;
+   }
+
+   //----------------------------------------------------------------
    /*!
    \brief Get data writer object.
@@ -346 +353 @@
       if (!allDomainEmpty)
       {
-         StdString filename = (!name.isEmpty()) ?   name.getValue() : getId();
+         StdString filename = getFileOutputName();
          StdOStringStream oss;
          oss << filename;
@@ -457 +464 @@
     if (!allDomainEmpty)
     {
-      StdString filename = (!name.isEmpty()) ? name.getValue() : getId();
+      StdString filename = getFileOutputName();
       StdOStringStream oss;
       oss << filename;

XIOS/trunk/src/node/file.hpp

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

XIOS/trunk/src/node/variable.cpp

@@ -45 +45 @@
       }
       content = boost::trim_copy(content) ;
+   }
+
+   const StdString& CVariable::getVariableOutputName(void) const
+   {
+     return name.isEmpty() ? getId() : name;
    }
 

XIOS/trunk/src/node/variable.hpp

@@ -62 +62 @@
 
             /// Accesseur ///
+            const StdString& getVariableOutputName(void) const;
             const StdString & getContent (void) const;