tidy up code

HicServices · Jul 17, 2024 · 9a56cc9 · 9a56cc9
1 parent 0539bae
commit 9a56cc9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 30 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: HicServices/RDMP
-          ref: v8.2.0
+          ref: develop
           path: RDMP
       - uses: actions/setup-dotnet@v4
         with:

diff --git a/SCIStorePlugin/Attachers/SciStoreAttacher.cs b/SCIStorePlugin/Attachers/SciStoreAttacher.cs
@@ -108,23 +108,9 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
                 $"{destRepo.ResultsTable.Rows.Count} rows added to Results Data Table"));
 
             // this repo uses DataTables, so next need to batch insert the table data into the DB
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Starting to insert headers"));
-
             BulkInsertDataTable(destRepo.HeadersTable, job);
-
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Completed inserting headers"));
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Starting to insert sample details"));
-
             BulkInsertDataTable(destRepo.SampleDetailsTable, job);
-
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Completed inserting sample details"));
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Starting to insert results"));
-
             BulkInsertDataTable(destRepo.ResultsTable, job);
-
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Completed inserting results"));
-
-
             _timer.Stop();
 
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "SciStoreAttacher::Attach complete"));
@@ -146,21 +132,6 @@ private void BulkInsertDataTable(DataTable dataTable, IDataLoadJob job)
 
         var tbl = _dbInfo.ExpectTable(dataTable.TableName);
         using var blk = tbl.BeginBulkInsert();
-        //DataTable ndt = dataTable.Clone();
-        //foreach (var row in dataTable.Rows)
-        //{
-        //    try
-        //    {
-        //        ndt = dataTable.Clone();
-        //        ndt.Rows.Add(row);
-        //        blk.Upload(ndt);
-        //    }
-        //    catch (Exception e)
-        //    {
-        //        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
-        //       $"Skipped a row due to error: {e.Message}.", e));
-        //    }
-        //}
         blk.Upload(dataTable);
     }