Merge discvr-22.11 to discvr-23.3 (#105)

* Bugfix to track import

* Fix error in mGAP track creation

Author: bbimber

mGAP/src/org/labkey/mgap/pipeline/GenerateMgapTracksStep.java

@@ -231,7 +231,7 @@ private void createOrUpdateTrack(SequenceOutputFile so, PipelineJob job, String
         {
             Container targetContainer = job.getContainer().isWorkbook() ? job.getContainer().getParent() : job.getContainer();
             TableInfo releaseTracks = QueryService.get().getUserSchema(job.getUser(), targetContainer, mGAPSchema.NAME).getTable(mGAPSchema.TABLE_RELEASE_TRACKS);
-            TableSelector ts = new TableSelector(releaseTracks, PageFlowUtil.set("rowid"), new SimpleFilter(FieldKey.fromString("trackName"), so.getName()), null);
+            TableSelector ts = new TableSelector(releaseTracks, PageFlowUtil.set("rowid"), new SimpleFilter(FieldKey.fromString("trackName"), trackName), null);
             if (!ts.exists())
             {
                 job.getLogger().debug("Creating new track: " + so.getName());