From 0ca302cef04ddbc09e9eed00205d239eb8ae7b21 Mon Sep 17 00:00:00 2001 From: James Friel Date: Fri, 10 Jan 2025 14:39:36 +0000 Subject: [PATCH 1/2] fix simple file extractor --- CHANGELOG.md | 1 + .../DataExtraction/Pipeline/SimpleFileExtractor.cs | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c4410727d..b3dec610b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Build on and target .Net 9 rather than 8 - Simplify DB Patching Interface +- Fix issue with Simple File Extractor pipeline component checking ## [8.4.2] - 2024-12-18 diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs index 7b31947518..1c15509ace 100644 --- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs +++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs @@ -72,17 +72,6 @@ public override void Check(ICheckNotifier notifier) notifier.OnCheckPerformed(new CheckEventArgs( $"PerPatient is false but Pattern {Pattern} contains token $p. This token will never be matched in MoveAll mode", CheckResult.Fail)); - - try - { - notifier.OnCheckPerformed(new CheckEventArgs($"Output path is:{GetDestinationDirectory()}", - CheckResult.Success)); - } - catch (Exception ex) - { - throw new Exception( - "Unable to to determine output directory from 'OutputDirectoryName'. Perhaps pattern is bad", ex); - } } protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener, @@ -124,7 +113,7 @@ public DirectoryInfo GetDestinationDirectory() if (path.Contains("$p")) path = path.Replace("$p", _command.Project.ExtractionDirectory); if (path.Contains("$n")) path = path.Replace("$n", _command.Project.ProjectNumber.ToString()); - if (path.Contains("$c")) + if (path.Contains("$c") ) path = path.Replace("$c", new ExtractionDirectory(_command.Project.ExtractionDirectory, _command.Configuration) .ExtractionDirectoryInfo.FullName); From 974b7af4cc5b8d77746614f414bc1553a5b29a11 Mon Sep 17 00:00:00 2001 From: James Friel Date: Fri, 10 Jan 2025 15:03:48 +0000 Subject: [PATCH 2/2] fix white space --- .../DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs index 1c15509ace..47da26b694 100644 --- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs +++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs @@ -113,7 +113,7 @@ public DirectoryInfo GetDestinationDirectory() if (path.Contains("$p")) path = path.Replace("$p", _command.Project.ExtractionDirectory); if (path.Contains("$n")) path = path.Replace("$n", _command.Project.ProjectNumber.ToString()); - if (path.Contains("$c") ) + if (path.Contains("$c")) path = path.Replace("$c", new ExtractionDirectory(_command.Project.ExtractionDirectory, _command.Configuration) .ExtractionDirectoryInfo.FullName);