LONGTERM_ARCHIVED

TIK-NFL · Mar 11, 2024 · 215af54 · 215af54
1 parent f9ffc7d
commit 215af54
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -107,7 +107,7 @@ public int compare(DatasetVersion o1, DatasetVersion o2) {
     //IMPORTANT: If you add a new value to this enum, you will also have to modify the
     // StudyVersionsFragment.xhtml in order to display the correct value from a Resource Bundle
     public enum VersionState {
-        DRAFT, RELEASED, ARCHIVED, DEACCESSIONED
+        DRAFT, RELEASED, ARCHIVED, DEACCESSIONED, LONGTERM_ARCHIVED
     }
 
     public static final int ARCHIVE_NOTE_MAX_LENGTH = 1000;

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ArchiveDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ArchiveDatasetCommand.java
@@ -74,17 +74,17 @@ public ArchiveDatasetResult execute(CommandContext ctxt) throws CommandException
 
         if (theDataset.getPublicationDate() == null) {
             // First Release
-            theDataset.getLatestVersion().setVersionNumber(new Long(1)); // minor release is blocked by #verifyCommandArguments
-            theDataset.getLatestVersion().setMinorVersionNumber(new Long(0));
+            theDataset.getLatestVersion().setVersionNumber(Long.valueOf(1)); // minor release is blocked by #verifyCommandArguments
+            theDataset.getLatestVersion().setMinorVersionNumber(Long.valueOf(0));
 
         } else if ( minorRelease ) {
-            theDataset.getLatestVersion().setVersionNumber(new Long(theDataset.getVersionNumber()));
-            theDataset.getLatestVersion().setMinorVersionNumber(new Long(theDataset.getMinorVersionNumber() + 1));
+            theDataset.getLatestVersion().setVersionNumber(Long.valueOf(theDataset.getVersionNumber()));
+            theDataset.getLatestVersion().setMinorVersionNumber(Long.valueOf(theDataset.getMinorVersionNumber() + 1));
 
         } else {
             // major, non-first release
-            theDataset.getLatestVersion().setVersionNumber(new Long(theDataset.getVersionNumber() + 1));
-            theDataset.getLatestVersion().setMinorVersionNumber(new Long(0));
+            theDataset.getLatestVersion().setVersionNumber(Long.valueOf(theDataset.getVersionNumber() + 1));
+            theDataset.getLatestVersion().setMinorVersionNumber(Long.valueOf(0));
         }
 
         // Perform any optional validation steps, if defined:

diff --git a/...main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetArchiveCommand.java b/...main/java/edu/harvard/iq/dataverse/engine/command/impl/FinalizeDatasetArchiveCommand.java
@@ -77,7 +77,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
 
         // validate the physical files before we do anything else: 
         // (unless specifically disabled; or a minor version)
-        if (theDataset.getLatestVersion().getVersionState() != RELEASED
+        if (theDataset.getLatestVersion().getVersionState() != LONGTERM_ARCHIVED
                 && theDataset.getLatestVersion().getMinorVersionNumber() != null
                 && theDataset.getLatestVersion().getMinorVersionNumber().equals((long) 0)
                 && ctxt.systemConfig().isDatafileValidationOnPublishEnabled()) {
@@ -185,7 +185,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
             ctxt.engine().submit(new DeletePrivateUrlCommand(getRequest(), theDataset));
         }
 
-	if (theDataset.getLatestVersion().getVersionState() != RELEASED) {
+	if (theDataset.getLatestVersion().getVersionState() != LONGTERM_ARCHIVED) {
             // some imported datasets may already be released.
 
             if (!datasetExternallyReleased) {
@@ -196,7 +196,7 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
                 // a failure - it will remove any locks, and it will send a
                 // proper notification to the user(s). 
             }
-            theDataset.getLatestVersion().setVersionState(RELEASED);
+            theDataset.getLatestVersion().setVersionState(LONGTERM_ARCHIVED);
         }
 
         final Dataset ds = ctxt.em().merge(theDataset);