Skip to content

5552 - obey file PID flag in UpdateDvObjectPIDMetadataCommand #5553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 1 commit into from
Feb 15, 2019
Merged

5552 - obey file PID flag in UpdateDvObjectPIDMetadataCommand #5553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions ...n/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDvObjectPIDMetadataCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
import edu.harvard.iq.dataverse.engine.command.exception.PermissionException;
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
import edu.harvard.iq.dataverse.util.BundleUtil;
import java.sql.Timestamp;
import java.util.Collections;
Expand Down Expand Up @@ -52,12 +53,29 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
ctxt.em().merge(target);
ctxt.em().flush();
// When updating, we want to traverse through files even if the dataset itself
// didn't need updating.
String currentGlobalIdProtocol = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, "");
String dataFilePIDFormat = ctxt.settings().getValueForKey(SettingsServiceBean.Key.DataFilePIDFormat, "DEPENDENT");
boolean isFilePIDsEnabled = ctxt.systemConfig().isFilePIDsEnabled();
// We will skip trying to update the global identifiers for datafiles if they
// aren't being used.
// If they are, we need to assure that there's an existing PID or, as when
// creating PIDs, that the protocol matches that of the dataset DOI if
// we're going to create a DEPENDENT file PID.
String protocol = target.getProtocol();
for (DataFile df : target.getFiles()) {
doiRetString = idServiceBean.publicizeIdentifier(df);
if (doiRetString) {
df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
ctxt.em().merge(df);
ctxt.em().flush();
if (isFilePIDsEnabled && // using file PIDs and
(!(df.getIdentifier() == null || df.getIdentifier().isEmpty()) || // identifier exists, or
currentGlobalIdProtocol.equals(protocol) || // right protocol to create dependent DOIs, or
dataFilePIDFormat.equals("INDEPENDENT"))// or independent. TODO(pm) - check authority too
) {
doiRetString = idServiceBean.publicizeIdentifier(df);
if (doiRetString) {
df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
ctxt.em().merge(df);
ctxt.em().flush();
}
}
}
} else {
Expand Down