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

DS-2672 Typos in constants in DOIIdentifierProvider

Browse Source
This commit is contained in:
Jonas Van Goolen
2015-07-31 15:47:15 +02:00
parent 49d8ee2fae
commit e8bea8cc79
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ package org.dspace.identifier;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator;
import java.util.List; import java.util.List;
import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Metadatum; import org.dspace.content.Metadatum;
@@ -68,12 +67,12 @@ public class DOIIdentifierProvider
public static final String DOI_QUALIFIER = "uri"; public static final String DOI_QUALIFIER = "uri";
public static final Integer TO_BE_REGISTERED = 1; public static final Integer TO_BE_REGISTERED = 1;
public static final Integer TO_BE_RESERVERED = 2; public static final Integer TO_BE_RESERVED = 2;
public static final Integer IS_REGISTERED = 3; public static final Integer IS_REGISTERED = 3;
public static final Integer IS_RESERVED = 4; public static final Integer IS_RESERVED = 4;
public static final Integer UPDATE_RESERVERED = 5; public static final Integer UPDATE_RESERVED = 5;
public static final Integer UPDATE_REGISTERED = 6; public static final Integer UPDATE_REGISTERED = 6;
public static final Integer UPDATE_BEFORE_REGISTERATION = 7; public static final Integer UPDATE_BEFORE_REGISTRATION = 7;
public static final Integer TO_BE_DELETED = 8; public static final Integer TO_BE_DELETED = 8;
public static final Integer DELETED = 9; public static final Integer DELETED = 9;
@@ -251,7 +250,7 @@ public class DOIIdentifierProvider
return; return;
} }
doiRow.setColumn("status", TO_BE_RESERVERED); doiRow.setColumn("status", TO_BE_RESERVED);
try try
{ {
DatabaseManager.update(context, doiRow); DatabaseManager.update(context, doiRow);
@@ -353,11 +352,11 @@ public class DOIIdentifierProvider
} }
else if (TO_BE_REGISTERED == doiRow.getIntColumn("status")) else if (TO_BE_REGISTERED == doiRow.getIntColumn("status"))
{ {
doiRow.setColumn("status", UPDATE_BEFORE_REGISTERATION); doiRow.setColumn("status", UPDATE_BEFORE_REGISTRATION);
} }
else if (IS_RESERVED == doiRow.getIntColumn("status")) else if (IS_RESERVED == doiRow.getIntColumn("status"))
{ {
doiRow.setColumn("status", UPDATE_RESERVERED); doiRow.setColumn("status", UPDATE_RESERVED);
} }
else else
{ {
@@ -416,11 +415,11 @@ public class DOIIdentifierProvider
{ {
doiRow.setColumn("status", IS_REGISTERED); doiRow.setColumn("status", IS_REGISTERED);
} }
else if (UPDATE_BEFORE_REGISTERATION == doiRow.getIntColumn("status")) else if (UPDATE_BEFORE_REGISTRATION == doiRow.getIntColumn("status"))
{ {
doiRow.setColumn("status", TO_BE_REGISTERED); doiRow.setColumn("status", TO_BE_REGISTERED);
} }
else if (UPDATE_RESERVERED == doiRow.getIntColumn("status")) else if (UPDATE_RESERVED == doiRow.getIntColumn("status"))
{ {
doiRow.setColumn("status", IS_RESERVED); doiRow.setColumn("status", IS_RESERVED);
} }

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

@@ -179,19 +179,19 @@ public class DOIOrganiser {
if (line.hasOption('l')) if (line.hasOption('l'))
{ {
organiser.list("reservation", null, null, DOIIdentifierProvider.TO_BE_RESERVERED); organiser.list("reservation", null, null, DOIIdentifierProvider.TO_BE_RESERVED);
organiser.list("registration", null, null, DOIIdentifierProvider.TO_BE_REGISTERED); organiser.list("registration", null, null, DOIIdentifierProvider.TO_BE_REGISTERED);
organiser.list("update", null, null, organiser.list("update", null, null,
DOIIdentifierProvider.UPDATE_BEFORE_REGISTERATION, DOIIdentifierProvider.UPDATE_BEFORE_REGISTRATION,
DOIIdentifierProvider.UPDATE_REGISTERED, DOIIdentifierProvider.UPDATE_REGISTERED,
DOIIdentifierProvider.UPDATE_RESERVERED); DOIIdentifierProvider.UPDATE_RESERVED);
organiser.list("deletion", null, null, DOIIdentifierProvider.TO_BE_DELETED); organiser.list("deletion", null, null, DOIIdentifierProvider.TO_BE_DELETED);
} }
if (line.hasOption('s')) if (line.hasOption('s'))
{ {
TableRowIterator it = organiser TableRowIterator it = organiser
.getDOIsByStatus(DOIIdentifierProvider.TO_BE_RESERVERED); .getDOIsByStatus(DOIIdentifierProvider.TO_BE_RESERVED);
try { try {
if (!it.hasNext()) if (!it.hasNext())
@@ -244,8 +244,8 @@ public class DOIOrganiser {
if (line.hasOption('u')) if (line.hasOption('u'))
{ {
TableRowIterator it = organiser.getDOIsByStatus( TableRowIterator it = organiser.getDOIsByStatus(
DOIIdentifierProvider.UPDATE_BEFORE_REGISTERATION, DOIIdentifierProvider.UPDATE_BEFORE_REGISTRATION,
DOIIdentifierProvider.UPDATE_RESERVERED, DOIIdentifierProvider.UPDATE_RESERVED,
DOIIdentifierProvider.UPDATE_REGISTERED); DOIIdentifierProvider.UPDATE_REGISTERED);
try { try {

2
dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
View File

@@ -568,7 +568,7 @@ public class DOIIdentifierProviderTest
assumeNotNull(doiRow); assumeNotNull(doiRow);
assertTrue("Reservation of DOI did not set the corret DOI status.", assertTrue("Reservation of DOI did not set the corret DOI status.",
DOIIdentifierProvider.TO_BE_RESERVERED.intValue() == doiRow.getIntColumn("status")); DOIIdentifierProvider.TO_BE_RESERVED.intValue() == doiRow.getIntColumn("status"));
} }
@Test @Test