hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 23:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add metadata after DOI registered at registration agency.

Browse Source 
Add DOI to metadata of an item not before it is registered at
registration agency. After registration was successfull a new
DOI should be resolvable within a few minutes.

Don't change deleted DOIs. Added DOIIdentifierException.DELETED as new
error code. It will be thrown if someone tries to regsiter or reserve
a DOI that was deleted before.
This commit is contained in:
Pascal-Nicolas Becker
2013-10-07 13:19:09 +02:00
parent 5fbca5c763
commit 066c4a4223
2 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
View File

@@ -189,6 +189,13 @@ public class DOIIdentifierProvider
throw new RuntimeException("Error in database conncetion.", ex);
}
if (DELETED == doiRow.getIntColumn("status") ||
TO_BE_DELETED == doiRow.getIntColumn("status"))
{
throw new DOIIdentifierException("You tried to register a DOI that "
+ "is marked as DELETED.", DOIIdentifierException.DOI_IS_DELETED);
}
// Check status of DOI
if (IS_REGISTERED == doiRow.getIntColumn("status"))
{
@@ -206,19 +213,6 @@ public class DOIIdentifierProvider
log.warn("SQLException while changing status of DOI {} to be registered.", doi);
throw new RuntimeException(sqle);
}
// safe DOI as metadata of the item
try {
saveDOIToObject(context, dso, doi);
}
catch (AuthorizeException ae)
{
throw new IdentifierException("Not authorized to save a DOI as metadata of an dso!", ae);
}
catch (SQLException sqle)
{
throw new RuntimeException(sqle);
}
}
/**
@@ -270,11 +264,18 @@ public class DOIIdentifierProvider
public void reserveOnline(Context context, DSpaceObject dso, String identifier)
throws IdentifierException, IllegalArgumentException, SQLException
{
{
String doi = DOI.formatIdentifier(identifier);
// get TableRow and ensure DOI belongs to dso regarding our db
TableRow doiRow = loadOrCreateDOI(context, dso, doi);
if (DELETED == doiRow.getIntColumn("status") ||
TO_BE_DELETED == doiRow.getIntColumn("status"))
{
throw new DOIIdentifierException("You tried to reserve a DOI that "
+ "is marked as DELETED.", DOIIdentifierException.DOI_IS_DELETED);
}
// check if DOI is reserved at the registration agency
if (connector.isDOIReserved(context, doi))
{
@@ -291,7 +292,7 @@ public class DOIIdentifierProvider
{
connector.reserveDOI(context, dso, doi);
}
doiRow.setColumn("status", IS_RESERVED);
DatabaseManager.update(context, doiRow);
}
@@ -303,6 +304,13 @@ public class DOIIdentifierProvider
// get TableRow and ensure DOI belongs to dso regarding our db
TableRow doiRow = loadOrCreateDOI(context, dso, doi);
if (DELETED == doiRow.getIntColumn("status") ||
TO_BE_DELETED == doiRow.getIntColumn("status"))
{
throw new DOIIdentifierException("You tried to register a DOI that "
+ "is marked as DELETED.", DOIIdentifierException.DOI_IS_DELETED);
}
// check if the DOI is already registered online
if (connector.isDOIRegistered(context, doi))
{
@@ -352,8 +360,22 @@ public class DOIIdentifierProvider
}
}
// safe DOI as metadata of the item
try {
saveDOIToObject(context, dso, doi);
}
catch (AuthorizeException ae)
{
throw new IdentifierException("Not authorized to save a DOI as metadata of an dso!", ae);
}
catch (SQLException sqle)
{
throw new RuntimeException(sqle);
}
doiRow.setColumn("status", IS_REGISTERED);
DatabaseManager.update(context, doiRow);
DatabaseManager.update(context, doiRow);
}
public void updateMetadata(Context context, DSpaceObject dso, String identifier)
@@ -363,7 +385,14 @@ public class DOIIdentifierProvider
TableRow doiRow = null;
doiRow = loadOrCreateDOI(context, dso, doi);
if (DELETED == doiRow.getIntColumn("status") ||
TO_BE_DELETED == doiRow.getIntColumn("status"))
{
throw new DOIIdentifierException("You tried to register a DOI that "
+ "is marked as DELETED.", DOIIdentifierException.DOI_IS_DELETED);
}
if (IS_REGISTERED == doiRow.getIntColumn("status"))
{
doiRow.setColumn("status", UPDATE_REGISTERED);
@@ -377,7 +406,9 @@ public class DOIIdentifierProvider
doiRow.setColumn("status", UPDATE_RESERVERED);
}
else
{
return;
}
DatabaseManager.update(context, doiRow);
}
@@ -416,6 +447,28 @@ public class DOIIdentifierProvider
+ "DOI and DSpaceObject does not match!",
DOIIdentifierException.MISMATCH);
}
if (DELETED == doiRow.getIntColumn("status") ||
TO_BE_DELETED == doiRow.getIntColumn("status"))
{
throw new DOIIdentifierException("You tried to register a DOI that "
+ "is marked as DELETED.", DOIIdentifierException.DOI_IS_DELETED);
}
// check if doi is reserved for this specific dso
if (connector.isDOIReserved(context, identifier))
{
// check if doi is reserved for this specific dso
if (!connector.isDOIReserved(context, dso, doi))
{
log.warn("Trying to update metadata for DOI {}, that is reserved"
+ " for another dso.", doi);
throw new DOIIdentifierException("Trying to update metadta for "
+ "a DOI that is reserved for another object.",
DOIIdentifierException.DOI_ALREADY_EXISTS);
}
}
connector.updateMetadata(context, dso, doi);