Skip to content

Handle trailing period in list archive import #7181

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
labkey-tchad merged 1 commit into from
Nov 11, 2025
Merged

Handle trailing period in list archive import #7181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions list/src/org/labkey/list/model/ListImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,14 @@ public void processMany(VirtualFile listsDir, Container c, User user, List<Strin
if (listXml != null)
createDefinedLists(listsDir, listXml, c, user, validatorImporters, errors, log);

Map<String, String> fileTypeMap = new HashMap<>();
Map<String, String> fileNameMap = new HashMap<>();

//get corresponding data file name and extension
//get corresponding list and data file names
for (String f : listsDir.list())
{
if (f.endsWith(".tsv") || f.endsWith(".xlsx") || f.endsWith(".xls"))
{
fileTypeMap.put(FileUtil.makeLegalName(FileUtil.getBaseName(f)), FileUtil.getExtension(f));
fileNameMap.put(FileUtil.getBaseName(FileUtil.makeLegalName(f)), f);
}
}

Expand All @@ -358,17 +358,15 @@ public void processMany(VirtualFile listsDir, Container c, User user, List<Strin
for (String listName : lists.keySet())
{
ListDefinition def = lists.get(listName);
String legalName = FileUtil.makeLegalName(listName);
String fileName = fileNameMap.remove(FileUtil.getBaseName(FileUtil.makeLegalName(listName + ".tsv")));

//Issue 37324: Skip processing if a data file is missing during list archive import
//Case when a list exists in the db, but its corresponding data file is not present
if (!fileTypeMap.containsKey(legalName))
if (fileName == null)
{
continue;
}

String fileName = legalName + "." + fileTypeMap.remove(legalName);

if (!processSingle(listsDir, def, fileName, listXml != null, c, user, errors, log))
{
failedLists++;
Expand All @@ -387,12 +385,12 @@ public void processMany(VirtualFile listsDir, Container c, User user, List<Strin
{
log.warn(StringUtilsLabKey.pluralize(failedLists, "list") + " failed to import");
}
if (!fileTypeMap.isEmpty())
if (!fileNameMap.isEmpty())
{
log.info("The following files were not imported because the server could not find a list with matching name: ");
for (String s : fileTypeMap.keySet())
for (String s : fileNameMap.values())
{
log.info("\tSkipped " + s + "." + fileTypeMap.get(s));
log.info("\tSkipped " + s);
}
}
}
Expand Down