Skip to content

Fix folder import with domain containing special characters #6915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XingY merged 3 commits into from
Aug 13, 2025
Merged

Fix folder import with domain containing special characters #6915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14078dd
Fix folder import with domain containing special characters
XingY Aug 11, 2025
0bd5443
Fix folder import with domain containing special characters
XingY Aug 11, 2025
d6900c9
Merge branch 'develop' into fb_requiredLineageTest
labkey-danield Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/samples/AbstractExpFolderImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ protected void importTsvData(FolderImportContext ctx, XarContext xarContext, Str
{
String tableName = expObject.getName();
// tsv file name will have been generated from a sanitized table name
String fileName = FileUtil.makeLegalName(tableName);
String fileName = FileUtil.makeLegalName(tableName + ".tsv");
if (dataFileMap.containsKey(fileName))
{
String dataFileName = dataFileMap.get(fileName);
Expand Down
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/samples/DataClassFolderImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected void importDataFiles(FolderImportContext ctx, VirtualFile xarDir, XarR
{
if (file.toLowerCase().endsWith(".tsv") && file.startsWith(DataClassFolderWriter.DATA_CLASS_PREFIX))
{
dataClassDataFiles.put(FileUtil.getBaseName(file.substring(DataClassFolderWriter.DATA_CLASS_PREFIX.length())), file);
dataClassDataFiles.put(FileUtil.getBaseName(file.substring(DataClassFolderWriter.DATA_CLASS_PREFIX.length()) + ".tsv"), file);
}
}

Expand Down
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/samples/SampleStatusFolderImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ else if (file.toLowerCase().endsWith(".tsv"))
{
if (file.startsWith(SampleTypeFolderWriter.SAMPLE_STATUS_PREFIX))
{
sampleStatusDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_STATUS_PREFIX.length())), file);
sampleStatusDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_STATUS_PREFIX.length()) + ".tsv"), file);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/samples/SampleTypeFolderImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected void importDataFiles(FolderImportContext ctx, VirtualFile xarDir, XarR
{
if (file.toLowerCase().endsWith(".tsv") && file.startsWith(SampleTypeFolderWriter.SAMPLE_TYPE_PREFIX))
{
sampleTypeDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_TYPE_PREFIX.length())), file);
sampleTypeDataFiles.put(FileUtil.getBaseName(file.substring(SampleTypeFolderWriter.SAMPLE_TYPE_PREFIX.length()) + ".tsv"), file);
}
}

Expand Down