Changeset 526 for XIOS/trunk/src/interface

Timestamp:

12/02/14 15:18:09 (9 years ago)

Author:

rlacroix

Message:

Convert some attributes to enumerations:

• file: par_access
• context: calendar_type

Those changes should have no effect on existing XML configuration files and ensure that a proper error message is always displayed during parsing if the value is not supported.

Location:

XIOS/trunk/src/interface/c_attr

Files:

• iccontext_attr.cpp (modified) (2 diffs)
• icfile_attr.cpp (modified) (2 diffs)
• icfilegroup_attr.cpp (modified) (2 diffs)

XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp

@@ -22 +22 @@
     if(!cstr2string(calendar_type, calendar_type_size, calendar_type_str)) return;
      CTimer::get("XIOS").resume();
-    context_hdl->calendar_type.setValue(calendar_type_str);
+    context_hdl->calendar_type.fromString(calendar_type_str);
      CTimer::get("XIOS").suspend();
   }
@@ -29 +29 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->calendar_type.getInheritedValue(),calendar_type , calendar_type_size))
+    if(!string_copy(context_hdl->calendar_type.getInheritedStringValue(),calendar_type , calendar_type_size))
       ERROR("void cxios_get_context_calendar_type(context_Ptr context_hdl, char * calendar_type, int calendar_type_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();

XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

@@ -215 +215 @@
     if(!cstr2string(par_access, par_access_size, par_access_str)) return;
      CTimer::get("XIOS").resume();
-    file_hdl->par_access.setValue(par_access_str);
+    file_hdl->par_access.fromString(par_access_str);
      CTimer::get("XIOS").suspend();
   }
@@ -222 +222 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(file_hdl->par_access.getInheritedValue(),par_access , par_access_size))
+    if(!string_copy(file_hdl->par_access.getInheritedStringValue(),par_access , par_access_size))
       ERROR("void cxios_get_file_par_access(file_Ptr file_hdl, char * par_access, int par_access_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();

XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

@@ -241 +241 @@
     if(!cstr2string(par_access, par_access_size, par_access_str)) return;
      CTimer::get("XIOS").resume();
-    filegroup_hdl->par_access.setValue(par_access_str);
+    filegroup_hdl->par_access.fromString(par_access_str);
      CTimer::get("XIOS").suspend();
   }
@@ -248 +248 @@
   {
      CTimer::get("XIOS").resume();
-    if(!string_copy(filegroup_hdl->par_access.getInheritedValue(),par_access , par_access_size))
+    if(!string_copy(filegroup_hdl->par_access.getInheritedStringValue(),par_access , par_access_size))
       ERROR("void cxios_get_filegroup_par_access(filegroup_Ptr filegroup_hdl, char * par_access, int par_access_size)", <<"Input string is to short");
      CTimer::get("XIOS").suspend();