Handle Ruskin 1.13 date format change and update variable names.

aodn · Jun 19, 2017 · d7a253a · d7a253a
1 parent 6f5bbc9
commit d7a253a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Parser/readXR620.m b/Parser/readXR620.m
@@ -247,10 +247,10 @@
                       data.(vars{k}) = data.(vars{k})/10;
 
                       %Temperature (Celsius degree)
-                  case {'Temp', 'temp02'}, name = 'TEMP';
+                  case {'Temp', 'temp02', 'temp12'}, name = 'TEMP';
 
                       %Pressure (dBar)
-                  case {'Pres', 'pres20'}, name = 'PRES';
+                  case {'Pres', 'pres20', 'pres21'}, name = 'PRES';
 
                       %Relative Pressure (dBar)
                   case {'pres08'}, name = 'PRES_REL';
@@ -514,7 +514,7 @@
                       data.(fields{k}) = data.(fields{k})/10;
 
                       %Temperature (Celsius degree)
-                  case {'Temp', 'temp02'}, name = 'TEMP';
+                  case {'Temp', 'temp02', 'temp12'}, name = 'TEMP';
 
                       %Pressure (dBar)
                   case {'Pres', 'pres08'}, name = 'PRES';
@@ -881,7 +881,11 @@
       if isempty(strfind(data.Date{1}, '-'))
           data.time = datenum(data.Date, 'yyyy/mmm/dd') + datenum(data.Time, 'HH:MM:SS.FFF') - datenum('00:00:00', 'HH:MM:SS');
       else
-          data.time = datenum(data.Date, 'dd-mmm-yyyy') + datenum(data.Time, 'HH:MM:SS.FFF') - datenum('00:00:00', 'HH:MM:SS');
+          % Ruskin version number <= 1.12 date format 'dd-mmm-yyyy'
+          % Ruskin version number 1.13 date format 'yyyy-mm-dd'
+          % can either do some simple date format test or see if datenum
+          % can figure it out
+          data.time = datenum(data.Date) + datenum(data.Time, 'HH:MM:SS.FFF') - datenum('00:00:00', 'HH:MM:SS');
       end
   end