Skip to content
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

Jump to bottom

4828 - handle pre-registering providers when creating file pids #4830

Merged
merged 7 commits into from
Aug 3, 2018
Merged

4828 - handle pre-registering providers when creating file pids #4830

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe1e7f3
4828 - handle pre-registering providers when creating file pids
qqmyers Jul 10, 2018
fe96e96
Merge remote-tracking branch 'IQSS/develop' into
qqmyers Jul 23, 2018
8712c94
revert whitespace changes, making diff as small as possible #4828
pdurbin Jul 24, 2018
e804b70
Improve per @pdurbin comment
qqmyers Jul 24, 2018
5157740
Merge branch '4828-DOI_registration_with_EZID_does_not_make_DOIs_public'
qqmyers Jul 25, 2018
cb25b98
Merge issue - GlobalIdServiceBean doesn't handle null protocol
qqmyers Aug 3, 2018
4d45d2d
Merge remote-tracking branch 'IQSS/develop' into 4828-DOI_registratio…
qqmyers Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterDvObjectCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
String nonNullDefaultIfKeyNotFound = "";
String protocol = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
String authority = ctxt.settings().getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(target.getProtocol(), ctxt);
// Get the idServiceBean that is configured to mint new IDs
GlobalIdServiceBean idServiceBean = GlobalIdServiceBean.getBean(protocol, ctxt);
try {
//Test to see if identifier already present
//if so, leave.
Expand All @@ -56,15 +57,20 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
}
String doiRetString = idServiceBean.createIdentifier(target);
if (doiRetString != null && doiRetString.contains(target.getIdentifier())) {
if (!idServiceBean.registerWhenPublished()) {
// Should register ID before publicize() is called
// For example, DOIEZIdServiceBean tries to recreate the id if the identifier isn't registered before
// publicizeIdentifier is called
target.setIdentifierRegistered(true);
target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
}
if (target.isReleased()) {
idServiceBean.publicizeIdentifier(target);
}

if (!idServiceBean.registerWhenPublished() || target.isReleased()) {
if (idServiceBean.registerWhenPublished() && target.isReleased()) {
target.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
target.setIdentifierRegistered(true);
}

ctxt.em().merge(target);
ctxt.em().flush();
if (target.isInstanceofDataset()) {
Expand All @@ -81,10 +87,17 @@ protected void executeImpl(CommandContext ctxt) throws CommandException {
}
doiRetString = idServiceBean.createIdentifier(df);
if (doiRetString != null && doiRetString.contains(df.getIdentifier())) {
if (!idServiceBean.registerWhenPublished()) {
// Should register ID before publicize() is called
// For example, DOIEZIdServiceBean tries to recreate the id if the identifier isn't registered before
// publicizeIdentifier is called
df.setIdentifierRegistered(true);
df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
}
if (df.isReleased()) {
idServiceBean.publicizeIdentifier(df);
}
if (!idServiceBean.registerWhenPublished() || df.isReleased()) {
if (idServiceBean.registerWhenPublished() && df.isReleased()) {
df.setGlobalIdCreateTime(new Timestamp(new Date().getTime()));
df.setIdentifierRegistered(true);
}
Expand Down