Changeset 1048 for XIOS/trunk/src

Timestamp:

02/02/17 17:34:47 (7 years ago)

Author:

ymipsl

Message:

• Xios output now an uuid for each files.
• 2 new file attribute to parametrize uuid output :
  • uuid_name (default is "uuid")
  • uuid_format : the substring "%uuid%" will replace by the uuid (default : no format)

YM

Location:

XIOS/trunk/src

Files:

• config/file_attribute.conf (modified) (1 diff)
• io/nc4_data_output.cpp (modified) (2 diffs)
• uuid.cpp (added)
• uuid.hpp (added)

XIOS/trunk/src/config/file_attribute.conf

@@ -29 +29 @@
 DECLARE_ATTRIBUTE(StdString, time_stamp_name)
 DECLARE_ATTRIBUTE(StdString, time_stamp_format)
+DECLARE_ATTRIBUTE(StdString, uuid_name)
+DECLARE_ATTRIBUTE(StdString, uuid_format)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -11 +11 @@
 #include "netCdfException.hpp"
 #include "exception.hpp"
+#include "uuid.hpp"
 
 namespace xios
@@ -2568 +2569 @@
            SuperClassWriter::addAttribute("Conventions", conventions);
            // SuperClassWriter::addAttribute("production" , production);
+
            StdString timeStampStr ;
            if (file->time_stamp_name.isEmpty()) timeStampStr="timeStamp" ;
            else timeStampStr=file->time_stamp_name ;
            SuperClassWriter::addAttribute(timeStampStr, timeStamp);
+
+           StdString uuidName ;
+           if (file->uuid_name.isEmpty()) uuidName="uuid" ;
+           else uuidName=file->uuid_name ;
+
+           if (file->uuid_format.isEmpty()) SuperClassWriter::addAttribute(uuidName, getUuidStr());
+           else SuperClassWriter::addAttribute(uuidName, getUuidStr(file->uuid_format));
+          
          }
          catch (CNetCdfException& e)