Changeset 530 for XIOS/branchs/xios-1.0

Timestamp:

12/09/14 13:02:34 (9 years ago)

Author:

rlacroix

Message:

Fix: String variable with whitespaces were incorrectly parsed.

The strings were only parsed until the first whitespace was encountered. Note that leading and trailing whitespaces are removed by design.

Also backport that fix to XIOS 1.0.

This commit fixes ticket #60.

File:

• XIOS/branchs/xios-1.0/src/node/variable.hpp (modified) (2 diffs)

XIOS/branchs/xios-1.0/src/node/variable.hpp

@@ -98 +98 @@
       }; // class CVar
 
-      template<>
-      inline bool CVariable::getData(void) const
-      {
-         if (content.compare("true")==0 || content.compare(".true.")==0 || content.compare(".TRUE.")==0) return true ;
-         else if (content.compare("false")==0 || content.compare(".false.")==0 || content.compare(".FALSE.")==0) return false ;
-         else ERROR("CVariable::getdata()",
-               << "Cannot convert string <" << content << "> into type required" );
-         return false ;
-      }
-
       template <typename T>
       inline T CVariable::getData(void) const
@@ -119 +109 @@
          return retval ;
       }
+
+      template<>
+      inline bool CVariable::getData(void) const
+      {
+         if (content.compare("true")==0 || content.compare(".true.")==0 || content.compare(".TRUE.")==0) return true ;
+         else if (content.compare("false")==0 || content.compare(".false.")==0 || content.compare(".FALSE.")==0) return false ;
+         else ERROR("CVariable::getdata()",
+               << "Cannot convert string <" << content << "> into type required" );
+         return false ;
+      }
+
+      template<>
+      inline std::string CVariable::getData(void) const
+      { return content; }
 
       template<>