#2734 return handling of one-off cases

IQSS · Mar 27, 2020 · 75b21e3 · 75b21e3
1 parent c468519
commit 75b21e3
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
@@ -405,12 +405,24 @@ public String getOriginalFileName() {
             DataTable dataTable = getDataTable();
             if (dataTable != null) {
                 return dataTable.getOriginalFileName() != null ? dataTable.getOriginalFileName()
-                        : getFileMetadata().getLabel().replaceAll(".tab$", FileUtil.generateOriginalExtension(getOriginalFileFormat()));
+                        : getDerivedOriginalFileName();
             }
         }
         return null;
     }
 
+
+    private String getDerivedOriginalFileName() {
+        FileMetadata fm = getFileMetadata();
+        String filename = fm.getLabel();
+        String originalExtension = FileUtil.generateOriginalExtension(getOriginalFileFormat());
+        String extensionToRemove = StringUtil.substringIncludingLast(filename, ".");
+        if (StringUtil.nonEmpty(extensionToRemove)) {
+            return filename.replaceAll(extensionToRemove + "$", originalExtension);
+        } else{
+            return filename + originalExtension ;
+        }        
+    }
 
     @Override
     public boolean isAncestorOf( DvObject other ) {