From a0d47135474d76688fc11b1e3f993e2728b14e72 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Wed, 21 Apr 2021 17:13:14 -0400 Subject: [PATCH 1/2] compare type against orig file (if ingested) --- .../iq/dataverse/datasetutility/AddReplaceFileHelper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java index e82e6d7ae37..7a94b12bc09 100644 --- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java @@ -1318,9 +1318,11 @@ private boolean step_040_auto_checkForDuplicates(){ // Has the content type of the file changed? // - if (!finalFileList.get(0).getContentType().equalsIgnoreCase(fileToReplace.getContentType())){ - - List errParams = Arrays.asList(fileToReplace.getFriendlyType(), + String origType = fileToReplace.getOriginalFileFormat() != null ? fileToReplace.getOriginalFileFormat() : fileToReplace.getContentType(); + if (!finalFileList.get(0).getContentType().equalsIgnoreCase(origType)) { + String friendlyType = fileToReplace.getOriginalFormatLabel() != null ? fileToReplace.getOriginalFormatLabel() : fileToReplace.getFriendlyType(); + + List errParams = Arrays.asList(friendlyType, finalFileList.get(0).getFriendlyType()); String contentTypeErr = BundleUtil.getStringFromBundle("file.addreplace.error.replace.new_file_has_different_content_type", From 60ae22807cdd5cd389be74b553bb4886876c3131 Mon Sep 17 00:00:00 2001 From: Jim Myers Date: Thu, 22 Apr 2021 15:13:09 -0400 Subject: [PATCH 2/2] rename --- .../iq/dataverse/datasetutility/AddReplaceFileHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java index 7a94b12bc09..2aa04c86f5d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java @@ -1318,8 +1318,8 @@ private boolean step_040_auto_checkForDuplicates(){ // Has the content type of the file changed? // - String origType = fileToReplace.getOriginalFileFormat() != null ? fileToReplace.getOriginalFileFormat() : fileToReplace.getContentType(); - if (!finalFileList.get(0).getContentType().equalsIgnoreCase(origType)) { + String fileType = fileToReplace.getOriginalFileFormat() != null ? fileToReplace.getOriginalFileFormat() : fileToReplace.getContentType(); + if (!finalFileList.get(0).getContentType().equalsIgnoreCase(fileType)) { String friendlyType = fileToReplace.getOriginalFormatLabel() != null ? fileToReplace.getOriginalFormatLabel() : fileToReplace.getFriendlyType(); List errParams = Arrays.asList(friendlyType,