Merge pull request #8 from mcrossley/master

v1.2.1
cumulusmx · May 20, 2022 · 4b4068f · 4b4068f
2 parents 3ee6b53 + 0fcfba8
commit 4b4068f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/CreateMissing.csproj b/CreateMissing.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
-    <Version>1.2.0</Version>
+    <AssemblyVersion>1.2.1.0</AssemblyVersion>
+    <FileVersion>1.2.1.0</FileVersion>
+    <Version>1.2.1</Version>
     <StartupObject>CreateMissing.Program</StartupObject>
     <TargetFramework>net48</TargetFramework>
     <Authors>Mark Crossley</Authors>

diff --git a/Program.cs b/Program.cs
@@ -289,8 +289,6 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 			var recCount = 0;
 			var idx = 0;
 
-
-			var entrydate = DateTime.MinValue;
 			var lastentrydate = DateTime.MinValue;
 			var lasttempvalue = 0.0;
 
@@ -377,7 +375,7 @@ private static Dayfilerec GetDayRecFromMonthly(DateTime date)
 							//var st = new List<string>(Regex.Split(line, CultureInfo.CurrentCulture.TextInfo.ListSeparator));
 							// Regex is very expensive, let's assume the separator is always a single character
 							var st = new List<string>(CurrentLogLines[CurrentLogLineNum].Split(dayfile.FieldSep[0]));
-							entrydate = Utils.DdmmyyhhmmStrToDate(st[0], st[1]);
+							var entrydate = Utils.DdmmyyhhmmStrToDate(st[0], st[1]);
 
 							// same meto day, or first record of the next day
 							// we want data from 00:00/09:00 to 00:00/09:00
@@ -913,6 +911,7 @@ private static Dayfilerec GetSolarDayRecFromMonthly(DateTime date, Dayfilerec re
 							{
 								// we are just getting the solar values to midnight
 								ExtractSolarData(st, ref rec, entrydate);
+								started = true;
 							}
 							else if (started)
 							{
@@ -923,12 +922,6 @@ private static Dayfilerec GetSolarDayRecFromMonthly(DateTime date, Dayfilerec re
 
 								return rec;
 							}
-							else
-							{
-								// We didn't find any data
-								CurrentSolarLogLineNum = 0;
-								return rec;
-							}
 
 							CurrentSolarLogLineNum++;
 						} // end while

diff --git a/Updates.txt b/Updates.txt
@@ -1,9 +1,13 @@
+1.2.1
+—————
+- Fix: Solar values not being populated in v1.2.0
+
 1.2.0
 —————
 - Change: Now based on .Net Framework 4.8
 - Now parses the source files for field and date separators rather than relying on system settings
 - Now flags if duplicate days are found in the dayfile.txt
-- Now flags if the out of order entries are found in dayfile.txt
+- Now flags if out of order entries are found in dayfile.txt
 
 1.1.1
 —————