hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10334 from DSpace/backport-9835-to-dspace-7_x

Browse Source 
[Port dspace-7_x] On error in DOI Organiser bulk operations, continue instead of panic-stopping.
This commit is contained in:
Tim Donohue
2025-01-27 10:27:19 -06:00
committed by GitHub
parent a54d61923a 6d187a08fd
commit 8cb693ab62
3 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
View File

@@ -13,7 +13,6 @@ import java.io.PrintStream;
import java.sql.SQLException;
import java.util.Arrays;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.UUID;
@@ -227,8 +226,16 @@ public class DOIOrganiser {
}
for (DOI doi : dois) {
organiser.reserve(doi);
context.uncacheEntity(doi);
doi = context.reloadEntity(doi);
try {
organiser.reserve(doi);
context.commit();
} catch (RuntimeException e) {
System.err.format("DOI %s for object %s reservation failed, skipping: %s%n",
doi.getDSpaceObject().getID().toString(),
doi.getDoi(), e.getMessage());
context.rollback();
}
}
} catch (SQLException ex) {
System.err.println("Error in database connection:" + ex.getMessage());
@@ -245,14 +252,22 @@ public class DOIOrganiser {
+ "that could be registered.");
}
for (DOI doi : dois) {
organiser.register(doi);
context.uncacheEntity(doi);
doi = context.reloadEntity(doi);
try {
organiser.register(doi);
context.commit();
} catch (SQLException e) {
System.err.format("DOI %s for object %s registration failed, skipping: %s%n",
doi.getDSpaceObject().getID().toString(),
doi.getDoi(), e.getMessage());
context.rollback();
}
}
} catch (SQLException ex) {
System.err.println("Error in database connection:" + ex.getMessage());
System.err.format("Error in database connection: %s%n", ex.getMessage());
ex.printStackTrace(System.err);
} catch (DOIIdentifierException ex) {
System.err.println("Error registering DOI identifier:" + ex.getMessage());
} catch (RuntimeException ex) {
System.err.format("Error registering DOI identifier: %s%n", ex.getMessage());
}
}
@@ -268,8 +283,9 @@ public class DOIOrganiser {
}
for (DOI doi : dois) {
doi = context.reloadEntity(doi);
organiser.update(doi);
context.uncacheEntity(doi);
context.commit();
}
} catch (SQLException ex) {
System.err.println("Error in database connection:" + ex.getMessage());
@@ -286,12 +302,17 @@ public class DOIOrganiser {
+ "that could be deleted.");
}
Iterator<DOI> iterator = dois.iterator();
while (iterator.hasNext()) {
DOI doi = iterator.next();
iterator.remove();
organiser.delete(doi.getDoi());
context.uncacheEntity(doi);
for (DOI doi : dois) {
doi = context.reloadEntity(doi);
try {
organiser.delete(doi.getDoi());
context.commit();
} catch (SQLException e) {
System.err.format("DOI %s for object %s deletion failed, skipping: %s%n",
doi.getDSpaceObject().getID().toString(),
doi.getDoi(), e.getMessage());
context.rollback();
}
}
} catch (SQLException ex) {
System.err.println("Error in database connection:" + ex.getMessage());
@@ -401,12 +422,18 @@ public class DOIOrganiser {
/**
* Register DOI with the provider
* @param doiRow - doi to register
* @param filter - logical item filter to override
* @throws SQLException
* @throws DOIIdentifierException
* @param doiRow DOI to register
* @param filter logical item filter to override
* @throws IllegalArgumentException
* if {@link doiRow} does not name an Item.
* @throws IllegalStateException
* on invalid DOI.
* @throws RuntimeException
* on database error.
*/
public void register(DOI doiRow, Filter filter) throws SQLException, DOIIdentifierException {
public void register(DOI doiRow, Filter filter)
throws IllegalArgumentException, IllegalStateException,
RuntimeException {
DSpaceObject dso = doiRow.getDSpaceObject();
if (Constants.ITEM != dso.getType()) {
throw new IllegalArgumentException("Currenty DSpace supports DOIs for Items only.");
@@ -473,30 +500,33 @@ public class DOIOrganiser {
}
/**
* Register DOI with the provider
* @param doiRow - doi to register
* @throws SQLException
* @throws DOIIdentifierException
* Register DOI with the provider.
* @param doiRow DOI to register
* @throws IllegalArgumentException passed through.
* @throws IllegalStateException passed through.
* @throws RuntimeException passed through.
*/
public void register(DOI doiRow) throws SQLException, DOIIdentifierException {
public void register(DOI doiRow)
throws IllegalStateException, IllegalArgumentException,
RuntimeException {
register(doiRow, this.filter);
}
/**
* Reserve DOI with the provider,
* @param doiRow - doi to reserve
* @throws SQLException
* @throws DOIIdentifierException
*/
public void reserve(DOI doiRow) {
reserve(doiRow, this.filter);
}
/**
* Reserve DOI with the provider
* Reserve DOI with the provider.
* @param doiRow - doi to reserve
* @throws SQLException
* @throws DOIIdentifierException
* @param filter - Logical item filter to determine whether this
* identifier should be reserved online.
* @throws IllegalStateException on invalid DOI.
* @throws RuntimeException on database error.
*/
public void reserve(DOI doiRow, Filter filter) {
DSpaceObject dso = doiRow.getDSpaceObject();

19
dspace-api/src/main/java/org/dspace/identifier/doi/package-info.java
View File

@@ -6,17 +6,14 @@
* http://www.dspace.org/license/
*/
/**
* Make requests to the DOI registration angencies, f.e.to
* <a href='http://n2t.net/ezid/'>EZID</a> DOI service, and analyze the responses.
*
* Make requests to the DOI registration agencies and analyze the responses.
*
* <p>
* Use {@link org.dspace.identifier.ezid.EZIDRequestFactory#getInstance} to
* configure an {@link org.dspace.identifier.ezid.EZIDRequest}
* with your authority number and credentials. {@code EZIDRequest} encapsulates
* EZID's operations (lookup, create/mint, modify, delete...).
* An operation returns an {@link org.dspace.identifier.ezid.EZIDResponse} which
* gives easy access to EZID's status code and value, status of the underlying
* HTTP request, and key/value pairs found in the response body (if any).
* </p>
* {@link DOIOrganiser} is a tool for managing DOI registrations.
*
* <p>
* Classes specific to the <a href='https://datacite.org/'>DataCite</a>
* registrar are here. See {@link org.dspace.identifier.ezid} for the
* <a href='https://ezid.cdlib.org'>EZID</a> registrar.
*/
package org.dspace.identifier.doi;

21
dspace-api/src/main/java/org/dspace/identifier/ezid/package-info.java Normal file
View File

@@ -0,0 +1,21 @@
/**
* The contents of this file are subject to the license and copyright
* detailed in the LICENSE and NOTICE files at the root of the source
* tree and available online at
*
* http://www.dspace.org/license/
*/
/**
* DOI classes specific to the EZID registrar.
*
* <p>
* Use {@link org.dspace.identifier.ezid.EZIDRequestFactory#getInstance} to
* configure an {@link org.dspace.identifier.ezid.EZIDRequest}
* with your authority number and credentials. {@code EZIDRequest} encapsulates
* EZID's operations (lookup, create/mint, modify, delete...).
* An operation returns an {@link org.dspace.identifier.ezid.EZIDResponse} which
* gives easy access to EZID's status code and value, status of the underlying
* HTTP request, and key/value pairs found in the response body (if any).
* </p>
*/
package org.dspace.identifier.ezid;