diff --git a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs index fd5a5ec..ae973b8 100644 --- a/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs +++ b/Adaptation/FileHandlers/MET08RESIMAPCDE/FileRead.cs @@ -31,7 +31,6 @@ public class FileRead : Shared.FileRead, IFileRead private readonly int _HyphenIsXToIQSSi; private readonly int _HyphenIsXToSPaCe; private readonly int _HyphenIsXToOpenInsight; - private readonly string _EventNameFileReadDaily; private readonly string _OpenInsightFilePattern; private readonly string _OpenInsightMetrologyViewerAPI; private readonly Dictionary _CellNames; @@ -64,7 +63,6 @@ public class FileRead : Shared.FileRead, IFileRead _HyphenIsXToIQSSi = (int)Hyphen.IsXToIQSSi; _HyphenIsXToSPaCe = (int)Hyphen.IsXToSPaCe; _HyphenIsXToOpenInsight = (int)Hyphen.IsXToOpenInsight; - _EventNameFileReadDaily = string.Concat(_EventNameFileRead, "Daily"); _IqsFile = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.File"); _MemoryPath = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "Path.Memory"); _HyphenIsXToOpenInsightMetrologyViewer = (int)Hyphen.IsXToOpenInsightMetrologyViewer; @@ -190,8 +188,8 @@ public class FileRead : Shared.FileRead, IFileRead List descriptions = GetDescriptions(jsonElements); Tuple>> tuple = GetTuple(this, from l in descriptions select (Shared.Properties.IDescription)l, extra: false); results = new Tuple>(pdsf.Item1, tuple.Item1, jsonElements, new List()); - bool isNotUsedInsightMetrologyViewerAttachments = (!(_FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) && _Hyphens == _HyphenIsXToOpenInsightMetrologyViewerAttachments); - bool isDummyRun = (_DummyRuns.Any() && _DummyRuns.ContainsKey(_Logistics.JobID) && _DummyRuns[_Logistics.JobID].Any() && (from l in _DummyRuns[_Logistics.JobID] where l == _Logistics.Sequence select 1).Any()); + bool isNotUsedInsightMetrologyViewerAttachments = !(_FileConnectorConfiguration.FileScanningIntervalInSeconds > 0) && _Hyphens == _HyphenIsXToOpenInsightMetrologyViewerAttachments; + bool isDummyRun = _DummyRuns.Any() && _DummyRuns.ContainsKey(_Logistics.JobID) && _DummyRuns[_Logistics.JobID].Any() && (from l in _DummyRuns[_Logistics.JobID] where l == _Logistics.Sequence select 1).Any(); if (isDummyRun) { try @@ -354,14 +352,7 @@ public class FileRead : Shared.FileRead, IFileRead continue; ZipFile.ExtractToDirectory(sourceArchiveFile, inProcessDirectory); if (fileConnectorConfigurationIncludeSubDirectories && includeSubDirectoriesExtra) - { - if (_EventName == _EventNameFileRead) checkDirectory = string.Concat(checkDirectory, @"\", sequence); - else if (_EventName == _EventNameFileReadDaily) - checkDirectory = string.Concat(checkDirectory, @"\Source\", sequence); - else - throw new Exception(); - } if (fileConnectorConfigurationIncludeSubDirectories) files = Directory.GetFiles(inProcessDirectory, "*", SearchOption.AllDirectories); else