add threading

SMI · Mar 8, 2024 · 8c5c93e · 8c5c93e
1 parent c807c02
commit 8c5c93e
Showing 1 changed file with 36 additions and 0 deletions.
diff --git a/Rdmp.Dicom/Extraction/FoDicomBased/FoDicomAnonymiser.cs b/Rdmp.Dicom/Extraction/FoDicomBased/FoDicomAnonymiser.cs
@@ -16,6 +16,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Rdmp.Core.QueryBuilding;
+using System.Threading.Tasks;
 
 namespace Rdmp.Dicom.Extraction.FoDicomBased
 {
@@ -149,8 +150,43 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
         private IColumn GetReleaseIdentifierColumn()
         {
+<<<<<<< Updated upstream
             return _extractCommand.QueryBuilder.SelectColumns.Select(c => c.IColumn).Single(c => c.IsExtractionIdentifier);
         }
+||||||| Stash base
+            var file = (string)processRow[RelativeArchiveColumnName];
+            fileRows.Add(file,processRow);
+            dicomFiles.Add((file,file));
+            releaseIDs.Add(file, processRow[releaseColumn.GetRuntimeName()].ToString());
+        }
+        foreach (var dicomFile in new AmbiguousFilePath(ArchiveRootIfAny,dicomFiles).GetDataset())
+        {
+            if (_errors > 0 && _errors > ErrorThreshold)
+                throw new Exception($"Number of errors reported ({_errors}) reached the threshold ({ErrorThreshold})");
+            cancellationToken.ThrowIfAbortRequested();
+            ProcessFile(dicomFile.Item2,listener, releaseIDs[dicomFile.Item1],_putter,fileRows[dicomFile.Item1]);
+        }
+=======
+            var file = (string)processRow[RelativeArchiveColumnName];
+            fileRows.Add(file,processRow);
+            dicomFiles.Add((file,file));
+            releaseIDs.Add(file, processRow[releaseColumn.GetRuntimeName()].ToString());
+        }
+        Parallel.ForEach(new AmbiguousFilePath(ArchiveRootIfAny, dicomFiles).GetDataset(), dicomFile =>
+        {
+            if (_errors > 0 && _errors > ErrorThreshold)
+                throw new Exception($"Number of errors reported ({_errors}) reached the threshold ({ErrorThreshold})");
+            cancellationToken.ThrowIfAbortRequested();
+            ProcessFile(dicomFile.Item2, listener, releaseIDs[dicomFile.Item1], _putter, fileRows[dicomFile.Item1]);
+        });
+        //foreach (var dicomFile in new AmbiguousFilePath(ArchiveRootIfAny,dicomFiles).GetDataset())
+        //{
+        //    if (_errors > 0 && _errors > ErrorThreshold)
+        //        throw new Exception($"Number of errors reported ({_errors}) reached the threshold ({ErrorThreshold})");
+        //    cancellationToken.ThrowIfAbortRequested();
+        //    ProcessFile(dicomFile.Item2,listener, releaseIDs[dicomFile.Item1],_putter,fileRows[dicomFile.Item1]);
+        //}
+>>>>>>> Stashed changes
 
         private DataColumn[] GetMetadataOnlyColumnsToProcess(DataTable toProcess)
         {