From 00f655a233994afe9a1e9eca60887405ccd376cc Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Wed, 5 Nov 2025 11:27:17 -0800
Subject: [PATCH] Handle trailing period in list import

---
 .../org/labkey/list/model/ListImporter.java    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/list/src/org/labkey/list/model/ListImporter.java b/list/src/org/labkey/list/model/ListImporter.java
index fb7e140e05e..8deda908ea7 100644
--- a/list/src/org/labkey/list/model/ListImporter.java
+++ b/list/src/org/labkey/list/model/ListImporter.java
@@ -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);
             }
         }
 
@@ -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++;
@@ -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);
             }
         }
     }