Adjust error, use resolveFile()

labkey-bpatel · labkey-bpatel · commit ce11f9a84246 · 2025-04-09T10:57:57.000-07:00
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java
@@ -2202,12 +2202,15 @@ public Object execute(ImportFastaSequencesForm form, BindException errors) throw
             //resolve files
             List<File> files = new ArrayList<>();
             PipeRoot root = PipelineService.get().getPipelineRootSetting(getContainer());
-            FileLike baseDir = null != root ? root.getRootFileLike() : null;
-            if (baseDir == null)
+
+            if (root == null)
             {
                 errors.reject(ERROR_MSG, "Pipeline root not configured");
                 return null;
             }
+
+            FileLike baseDir = StringUtils.trimToNull(form.getPath()) == null ? root.getRootFileLike() : root.getRootFileLike().resolveFile(new Path(form.getPath()));
+
             if (!baseDir.exists())
             {
                 errors.reject(ERROR_MSG, "Unable to find directory: " + baseDir.getPath());

Original file line number	Diff line number	Diff line change
`@@ -2202,12 +2202,15 @@ public Object execute(ImportFastaSequencesForm form, BindException errors) throw`
`2202`	`2202`	`//resolve files`
`2203`	`2203`	`List<File> files = new ArrayList<>();`
`2204`	`2204`	`PipeRoot root = PipelineService.get().getPipelineRootSetting(getContainer());`
`2205`		`- FileLike baseDir = null != root ? root.getRootFileLike() : null;`
`2206`		`- if (baseDir == null)`
	`2205`	`+`
	`2206`	`+ if (root == null)`
`2207`	`2207`	`{`
`2208`	`2208`	`errors.reject(ERROR_MSG, "Pipeline root not configured");`
`2209`	`2209`	`return null;`
`2210`	`2210`	`}`
	`2211`	`+`
	`2212`	`+ FileLike baseDir = StringUtils.trimToNull(form.getPath()) == null ? root.getRootFileLike() : root.getRootFileLike().resolveFile(new Path(form.getPath()));`
	`2213`	`+`
`2211`	`2214`	`if (!baseDir.exists())`
`2212`	`2215`	`{`
`2213`	`2216`	`errors.reject(ERROR_MSG, "Unable to find directory: " + baseDir.getPath());`