phares3757/met08thftirstratus
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nuget bump, QP oversight and tickOffset

Browse Source
This commit is contained in:
Mike Phares
2023-03-21 09:58:20 -07:00
parent c8e8775eab
commit bc0098bb9b
6 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Adaptation/FileHandlers/Stratus/ProcessData.cs
View File

@ -254,7 +254,7 @@ public partial class ProcessData : IProcessData
reactor = defaultReactor;
else
reactor = segments[0];
if (segments.Length <= 1 || !int.TryParse(segments[1], out int rdsValue) || rdsValue < 99)
if (segments.Length <= 1 || !int.TryParse(segments[1].Replace("QP", string.Empty), out int rdsValue) || rdsValue < 99)
rds = defaultRDS;
else
rds = segments[1];
@ -360,7 +360,7 @@ public partial class ProcessData : IProcessData
segments = cassette.Split(new char[] { '.' });
else
segments = cassette.Split(new char[] { '\u005F' });
bool hasRDS = Regex.IsMatch(cassette, "[-]?[0-9]{5,}[-]?");
bool hasRDS = Regex.IsMatch(cassette, "[-]?([QP][0-9]{4,}|[0-9]{5,})[-]?");
(reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, cassette, segments, hasRDS);
(layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
zone = GetZone(segments);

14
Adaptation/FileHandlers/txt/FileRead.cs
View File

@ -113,7 +113,7 @@ public class FileRead : Shared.FileRead, IFileRead
string cassetteID;
string fileNameTemp;
string tupleFileName;
DateTime cassetteTicks;
DateTime cassetteDateTime;
string directoryName = Path.GetDirectoryName(reportFullPath);
string sequenceDirectoryName = string.Concat(Path.GetDirectoryName(reportFullPath), @"\", _Logistics.Sequence);
string originalDataBioRad = string.Concat(Path.GetDirectoryName(reportFullPath), @"\", _OriginalDataBioRad, _Logistics.Sequence, ".txt");
@ -132,16 +132,16 @@ public class FileRead : Shared.FileRead, IFileRead
isBioRad = tuple.Item2;
dataText = tuple.Item4;
cassetteID = tuple.Item1;
cassetteTicks = tuple.Item3;
cassetteDateTime = tuple.Item3;
if (isBioRad)
tupleFileName = string.Concat("DetailDataBioRad_", cassetteID, "_", cassetteTicks.Ticks, ".txt");
tupleFileName = string.Concat("DetailDataBioRad_", cassetteID, "_", cassetteDateTime.Ticks, ".txt");
else
tupleFileName = string.Concat("CassetteDataBioRad_", cassetteID, "_", cassetteTicks.Ticks, ".txt");
tupleFileName = string.Concat("CassetteDataBioRad_", cassetteID, "_", cassetteDateTime.Ticks, ".txt");
fileNameTemp = string.Concat(sequenceDirectoryName, @"\", tupleFileName);
File.WriteAllText(fileNameTemp, dataText);
File.SetLastWriteTime(fileNameTemp, cassetteTicks);
if (_Logistics.Sequence != cassetteTicks.Ticks && File.Exists(originalDataBioRad))
File.Copy(originalDataBioRad, string.Concat(Path.GetDirectoryName(reportFullPath), @"\", _OriginalDataBioRad, cassetteTicks.Ticks, ".txt"));
File.SetLastWriteTime(fileNameTemp, cassetteDateTime);
if (_Logistics.Sequence != cassetteDateTime.Ticks && File.Exists(originalDataBioRad))
File.Copy(originalDataBioRad, string.Concat(Path.GetDirectoryName(reportFullPath), @"\", _OriginalDataBioRad, cassetteDateTime.Ticks, ".txt"));
File.Move(fileNameTemp, string.Concat(directoryName, @"\", tupleFileName));
}
if (Directory.Exists(sequenceDirectoryName))

4
Adaptation/FileHandlers/txt/ProcessData.cs
View File

@ -435,7 +435,7 @@ public partial class ProcessData
log.Debug($"****Extract(FDR): DataType = {dataType}");
if (!isBioRad)
{
cassetteDateTime = logistics.DateTimeFromSequence.AddTicks(i * -1);
cassetteDateTime = logistics.DateTimeFromSequence.AddTicks(tickOffset).AddTicks(i * -1);
results.Add(new Tuple<string, bool, DateTime, string>(cassetteID, isBioRad, cassetteDateTime, dataText));
}
else
@ -452,7 +452,7 @@ public partial class ProcessData
throw new Exception();
count += 1;
_ = contents.Clear();
cassetteDateTime = logistics.DateTimeFromSequence.AddTicks(count * -1);
cassetteDateTime = logistics.DateTimeFromSequence.AddTicks(tickOffset).AddTicks(count * -1);
user = processData.Employee?.ToString() ?? "";
recipe = detail.Recipe?.ToString() ?? "";
_ = contents.Append("Bio-Rad ").Append("QS400MEPI".PadRight(17)).Append("Recipe: ").Append(recipe.PadRight(25)).AppendLine(processData.Date.ToString(Stratus.Description.GetDateFormat()));