From 8dcc7622433dce3c41e0f34e1a4db475487219c2 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 15 Jan 2026 09:16:25 -0800
Subject: [PATCH 1/2] GitHub Issue 436: Remove conversion of file from rowId
 value

---
 .../labkey/api/data/ExpDataFileConverter.java | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/api/src/org/labkey/api/data/ExpDataFileConverter.java b/api/src/org/labkey/api/data/ExpDataFileConverter.java
index 159a9e4ae42..9baa56b4775 100644
--- a/api/src/org/labkey/api/data/ExpDataFileConverter.java
+++ b/api/src/org/labkey/api/data/ExpDataFileConverter.java
@@ -344,27 +344,27 @@ public static File convertToFile(Object value, @NotNull Container container, @No
         }
 
         // Value specified as simple property, so we have to guess what it might be
-        // First, try looking it up as a RowId
-        try
-        {
-            int dataRowId = Integer.parseInt(value.toString());
-            ExpData data = ExperimentService.get().getExpData(dataRowId);
-            if (data != null)
-            {
-                File result = data.getFile();
-                if (result != null)
-                {
-                    return result;
-                }
-            }
-        }
-        catch (NumberFormatException ignored)
-        {
-        }
+//        // First, try looking it up as a RowId
+//        try
+//        {
+//            int dataRowId = Integer.parseInt(value.toString());
+//            ExpData data = ExperimentService.get().getExpData(dataRowId);
+//            if (data != null)
+//            {
+//                File result = data.getFile();
+//                if (result != null)
+//                {
+//                    return result;
+//                }
+//            }
+//        }
+//        catch (NumberFormatException ignored)
+//        {
+//        }
 
         // toss in here an additional check, if starts with HTTP then try to use _webdav to resolve it
         // MAKE sure that the security is in place - figure out what container it is in
-        String rootSubstitutedPath = getFileRootSubstitutedFilePath(value.toString(), fileRootPath);;
+        String rootSubstitutedPath = getFileRootSubstitutedFilePath(value.toString(), fileRootPath);
         if (null != StringUtils.trimToNull(rootSubstitutedPath))
         {
             if (assayResultFileRoot != null)

From 45025d8a60676c1d5f5b81f85f945295c434be5e Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 19 Jan 2026 07:27:24 -0800
Subject: [PATCH 2/2] Add convert method with tryResolutionByRowId parameter

---
 .../labkey/api/data/ExpDataFileConverter.java | 50 +++++++++++--------
 .../labkey/experiment/ExpDataIterators.java   |  2 +-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/api/src/org/labkey/api/data/ExpDataFileConverter.java b/api/src/org/labkey/api/data/ExpDataFileConverter.java
index 9baa56b4775..0bf4e45f89f 100644
--- a/api/src/org/labkey/api/data/ExpDataFileConverter.java
+++ b/api/src/org/labkey/api/data/ExpDataFileConverter.java
@@ -210,6 +210,11 @@ private static DataType getDataType(@NotNull File file, @NotNull Collection<Assa
     }
 
     public static File convert(Object value)
+    {
+        return convert(value, true);
+    }
+
+    public static File convert(Object value, boolean tryResolutionByRowId)
     {
         if (value == null)
             return null;
@@ -226,7 +231,7 @@ public static File convert(Object value)
         {
             try
             {
-                return convert(value, fileRootPath, assayResultFileRoot, container, user);
+                return convert(value, fileRootPath, assayResultFileRoot, container, user, tryResolutionByRowId);
             }
             catch (ConvertHelper.FileConversionException e)
             {
@@ -242,12 +247,12 @@ public static File convert(Object value)
     }
 
     // TODO, refactor more usages to call this method directly without using needing to set/getEnvironment
-    public static File convert(Object value, @Nullable String fileRootPath, @Nullable FileLike assayResultFileRoot, Container container, User user)
+    public static File convert(Object value, @Nullable String fileRootPath, @Nullable FileLike assayResultFileRoot, Container container, User user, boolean tryResolutionByRowId)
     {
         if (value == null)
             return null;
 
-        File f = convertToFile(value, container, user, fileRootPath, assayResultFileRoot);
+        File f = convertToFile(value, container, user, fileRootPath, assayResultFileRoot, tryResolutionByRowId);
 
         // If we have a file path, make sure it's supposed to be visible in the current container
         if (f != null)
@@ -326,7 +331,7 @@ public static File convert(Object value, @Nullable String fileRootPath, @Nullabl
         return null;
     }
 
-    public static File convertToFile(Object value, @NotNull Container container, @NotNull User user, @Nullable String fileRootPath, @Nullable FileLike assayResultFileRoot)
+    public static File convertToFile(Object value, @NotNull Container container, @NotNull User user, @Nullable String fileRootPath, @Nullable FileLike assayResultFileRoot, boolean tryResolutionByRowId)
     {
         if (value instanceof File f)
         {
@@ -344,23 +349,26 @@ public static File convertToFile(Object value, @NotNull Container container, @No
         }
 
         // Value specified as simple property, so we have to guess what it might be
-//        // First, try looking it up as a RowId
-//        try
-//        {
-//            int dataRowId = Integer.parseInt(value.toString());
-//            ExpData data = ExperimentService.get().getExpData(dataRowId);
-//            if (data != null)
-//            {
-//                File result = data.getFile();
-//                if (result != null)
-//                {
-//                    return result;
-//                }
-//            }
-//        }
-//        catch (NumberFormatException ignored)
-//        {
-//        }
+        if (tryResolutionByRowId)
+        {
+            // First, try looking it up as a RowId
+            try
+            {
+                int dataRowId = Integer.parseInt(value.toString());
+                ExpData data = ExperimentService.get().getExpData(dataRowId);
+                if (data != null)
+                {
+                    File result = data.getFile();
+                    if (result != null)
+                    {
+                        return result;
+                    }
+                }
+            }
+            catch (NumberFormatException ignored)
+            {
+            }
+        }
 
         // toss in here an additional check, if starts with HTTP then try to use _webdav to resolve it
         // MAKE sure that the security is in place - figure out what container it is in
diff --git a/experiment/src/org/labkey/experiment/ExpDataIterators.java b/experiment/src/org/labkey/experiment/ExpDataIterators.java
index d6319804d5d..2d96ea4c1a9 100644
--- a/experiment/src/org/labkey/experiment/ExpDataIterators.java
+++ b/experiment/src/org/labkey/experiment/ExpDataIterators.java
@@ -2269,7 +2269,7 @@ public static class FileLinkDataIterator extends WrapperDataIterator
                             }
                         }
 
-                        return ExpDataFileConverter.convert(value);
+                        return ExpDataFileConverter.convert(value, false);
                     };
                 }
             }