Fixed issues with time window expressions in the mapping writer and compiler.

Author: StephenCWills

Source/Libraries/ECAClientUtilities/MappingCompiler.cs

@@ -560,6 +560,8 @@ private FieldMapping ParseSignalMapping()
             if (!m_endOfFile && m_currentChar != '\n')
                 ParseRelativeTime(fieldMapping);
 
+            SkipToNewline();
+
             if (!m_endOfFile && m_currentChar == '@')
                 ParseSampleRate(fieldMapping);
 
@@ -583,6 +585,8 @@ private FieldMapping ParseMappingMapping()
             if (!m_endOfFile && m_currentChar != '\n')
                 ParseRelativeTime(fieldMapping);
 
+            SkipToNewline();
+
             if (!m_endOfFile && m_currentChar == '@')
                 ParseSampleRate(fieldMapping);
 
@@ -611,6 +615,8 @@ private ArrayMapping ParseArraySignalMapping()
             else if (m_currentChar != '\n')
                 ParseWindowExpression(arrayMapping);
 
+            SkipToNewline();
+
             if (!m_endOfFile && m_currentChar == '@')
                 ParseSampleRate(arrayMapping);
 
@@ -639,6 +645,8 @@ private ArrayMapping ParseArrayMappingMapping()
             else if (m_currentChar != '\n')
                 ParseWindowExpression(arrayMapping);
 
+            SkipToNewline();
+
             if (!m_endOfFile && m_currentChar == '@')
                 ParseSampleRate(arrayMapping);
 
@@ -661,7 +669,6 @@ private void ParseWindowExpression(ArrayMapping arrayMapping)
                 ParseTimeSpan(arrayMapping);
                 arrayMapping.RelativeTime = arrayMapping.WindowSize;
                 arrayMapping.RelativeUnit = arrayMapping.WindowUnit;
-                SkipToNewline();
             }
             else if (identifier.Equals("from", StringComparison.OrdinalIgnoreCase))
             {
@@ -721,8 +728,6 @@ private void ParseRelativeTime(FieldMapping fieldMapping)
 
                 if (identifier != "ago")
                     RaiseCompileError($"Unexpected identifier: {identifier}. Expected 'ago' keyword.");
-
-                SkipToNewline();
             }
             else if (timeUnit != TimeSpan.Zero)
             {
@@ -759,18 +764,12 @@ private void ParseTimeSpan(ArrayMapping arrayMapping)
             arrayMapping.TimeWindowExpression += " " + identifier;
             timeUnit = ToTimeUnit(identifier);
 
-            if (identifier.Equals("point", StringComparison.OrdinalIgnoreCase) || identifier.Equals("points", StringComparison.OrdinalIgnoreCase))
-            {
-                // The "points" keyword is followed
-                // by an optional sample rate
-                SkipToNewline();
-            }
-            else if (timeUnit != TimeSpan.Zero)
+            if (timeUnit != TimeSpan.Zero)
             {
                 // If the identifier was a time unit, set WindowUnit
                 arrayMapping.WindowUnit = timeUnit;
             }
-            else
+            else if (!identifier.Equals("point", StringComparison.OrdinalIgnoreCase) && !identifier.Equals("points", StringComparison.OrdinalIgnoreCase))
             {
                 // If the identifier was not the ago keyword, raise an error
                 RaiseCompileError($"Unexpected identifier: {identifier}. Expected 'points' keyword or time unit.");

Source/Libraries/ECAClientUtilities/MappingWriter.cs

@@ -143,15 +143,17 @@ private void Write(TextWriter writer, TypeMapping typeMapping)
                     fieldMappingText = $"    {fieldMapping.Field.Identifier}: {expression} {ToRelativeTimeText(fieldMapping)}";
                 else if (arrayMapping.WindowSize == 0.0M)
                     fieldMappingText = $"    {fieldMapping.Field.Identifier}: {{ {fieldMapping.Expression} }} {ToRelativeTimeText(fieldMapping)}";
+                else if (fieldMapping.RelativeTime == 0.0M)
+                    fieldMappingText = $"    {fieldMapping.Field.Identifier}: {expression} last {ToTimeSpanText(arrayMapping)}";
                 else if (fieldMapping.RelativeTime != arrayMapping.WindowSize || fieldMapping.RelativeUnit != arrayMapping.WindowUnit)
                     fieldMappingText = $"    {fieldMapping.Field.Identifier}: {expression} from {ToRelativeTimeText(fieldMapping)} for {ToTimeSpanText(arrayMapping)}";
                 else
                     fieldMappingText = $"    {fieldMapping.Field.Identifier}: {expression} last {ToTimeSpanText(arrayMapping)}";
 
-                if (fieldMapping.SampleRate == 0.0M)
-                    writer.WriteLine(fieldMappingText);
-                else
+                if (fieldMapping.SampleRate != 0.0M)
                     writer.WriteLine($"{fieldMappingText} {ToSampleRateText(fieldMapping)}");
+                else
+                    writer.WriteLine(fieldMappingText);
             }
 
             writer.WriteLine("}");