Fix issue where importing from the pipeline root doesn't properly ass…

…ociate fcs files with the wsp Add a base relative root for the keywordPath Add a check to prevent NPE switch from deprecated method
LabKey · Nov 20, 2024 · 6bf3a48 · 6bf3a48
1 parent 5af4bf4
commit 6bf3a48
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
@@ -961,7 +961,7 @@ private void stepSelectAnalysis(ImportAnalysisForm form, BindException errors)
                         if (relPath != null)
                         {
                             String[] parts = StringUtils.split(relPath, File.separatorChar);
-                            String keywordPath = StringUtils.join(parts, "/");
+                            String keywordPath = "./" + StringUtils.join(parts, "/");
                             form.setKeywordDir(new String[] { keywordPath });
                         }
                         form.setSelectFCSFilesOption(SelectFCSFileOption.Browse);

diff --git a/flow/src/org/labkey/flow/script/KeywordsTask.java b/flow/src/org/labkey/flow/script/KeywordsTask.java
@@ -69,7 +69,7 @@ public static List<FlowRun> importFlowRuns(PipelineJob job, FlowProtocol protoco
         PipeRoot pr = PipelineService.get().findPipelineRoot(job.getContainer());
 
         KeywordsJob keywordsJob = new KeywordsJob(job.getInfo(), protocol, paths, targetStudyContainer, pr);
-        keywordsJob.setLogFile(job.getLogFile());
+        keywordsJob.setLogFile(job.getLogFilePath());
         keywordsJob.setLogLevel(job.getLogLevel());
         keywordsJob.setSubmitted();