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

We build a cron Job for Doi identifier reservation and registration.

Browse Source
This commit is contained in:
Marsa Haoua
2013-09-02 11:09:14 +02:00
committed by Pascal-Nicolas Becker
parent d44320305c
commit 66be510a64
11 changed files with 674 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,9 @@ public class DOIIdentifierProvider
public static final String DOI_ELEMENT = "identifier";
public static final String DOI_QUALIFIER = null;
// How many times do we want to try to find a new unique DOI?
private static final int THRESHOLD_UNIQUE_DOI = 1000;
/**
* Prefix of DOI namespace. Set in dspace.cfg.
*/
@@ -153,44 +156,55 @@ public class DOIIdentifierProvider
{
String doi = formatIdentifier(identifier);
// check if the DOI is already registered for this dso
if (connector.isDOIRegistered(context, dso, doi))
TableRow doiRow = null;
String status;
if (null != doi) {
try {
// get DOI object from Database
// remove DOI.SCHEME before searching in DB.
doiRow = DatabaseManager.findByUnique(context, "Doi",
"doi", doi.substring(DOI.SCHEME.length()));
if (null == doiRow) {
try {
createNewIdentifier(context, dso, doi);
}
catch (Exception e)
{
// TODO: better exception handling
throw new RuntimeException(e);
}
log.warn("Trying to register DOI {}, that not exist in DB.", doi);
} else {
if (doiRow.getIntColumn("resource_id") != dso.getID()
|| doiRow.getIntColumn("resource_type_id") != dso.getType()) {
throw new IdentifierException("Trying to reserve a DOI "
+ "that is reserved for another object.");
}
if ("isRegistered".equals(doiRow.getStringColumn("status")))
{
return;
// check if DOI is registered for another object
if (connector.isDOIRegistered(context, doi))
{
log.warn("Trying to register DOI {}, that is already registered.", doi);
throw new IdentifierException("Trying to register a DOI that is "
+ "registered for another object.");
}
// check if doi is reserved for this specific dso
if (!connector.isDOIReserved(context, dso, doi))
{
// check if doi is already reserved for another dso
if (connector.isDOIReserved(context, doi))
{
log.warn("Trying to register DOI {}, that is reserved for "
+ "another dso.", doi);
throw new IdentifierException("Trying to register a DOI " +
"that is reserved for another object.");
doiRow.setColumn("status", "toBeRegistered");
DatabaseManager.update(context, doiRow);
}
if(!connector.reserveDOI(context, dso, doi))
{
throw new IdentifierException("It was impossible to reserve the DOI "
+ doi + ". Take a look into the logs for further details.");
} catch (SQLException ex) {
log.error("Error while trying to change doi status "
+ dso.getTypeText() + " with ID " + dso.getID() + ".");
throw new RuntimeException("Error while while trying to change doi status "
+ "for a DOI " + dso.getTypeText()
+ " with ID " + dso.getID() + ".", ex);
}
}
if (!connector.registerDOI(context, dso, doi))
{
throw new IdentifierException("It was impossible to register the DOI "
+ doi + ". Take a look into the logs for further details.");
}
try {
saveDOIToObject(context, dso, doi);
}
@@ -231,38 +245,136 @@ public class DOIIdentifierProvider
{
String doi = formatIdentifier(identifier);
TableRow doiRow = null;
// ensure that the DOI is in our DOI table and is not reserved online
// for another object than dso
try {
createNewIdentifier(context, dso, doi);
doiRow = DatabaseManager.findByUnique(context, "Doi",
"doi", doi.substring(DOI.SCHEME.length()));
if (null == doiRow) {
log.warn("Trying to reserve DOI {}, that not exist in DB.", doi);
throw new IdentifierException("Trying to reserve a DOI "
+ "that not exist in DB.");
} else {
if (doiRow.getIntColumn("resource_id") != dso.getID()
|| doiRow.getIntColumn("resource_type_id") != dso.getType()) {
throw new IdentifierException("Trying to reserve a DOI "
+ "that is reserved for another object.");
}
catch (IllegalArgumentException ex)
{
if (!doiRow.isColumnNull("status")) {
return;
}
doiRow.setColumn("status", "toBeReserved");
DatabaseManager.update(context, doiRow);
}
} catch (IllegalArgumentException ex) {
throw new IdentifierException("DOI is reserved for another object.");
} catch (SQLException ex) {
throw new RuntimeException("Error in database connection: " + ex.getMessage());
}
catch (SQLException ex)
{
}
public void reserveDOIOnline(Context context, DSpaceObject dso, String identifier)
throws IdentifierException, IllegalArgumentException, SQLException {
String doi = formatIdentifier(identifier);
// ensure that the DOI is in our DOI table and is not reserved online
// for another object than dso
try {
createNewIdentifier(context, dso, doi);
} catch (IllegalArgumentException ex) {
throw new IdentifierException("DOI is reserved for another object.");
} catch (SQLException ex) {
throw new RuntimeException("Error in database connection: " + ex.getMessage());
}
// check if DOI is reserved at the registration agency for the specific dso
if (!connector.isDOIReserved(context, dso, doi))
{
if (connector.isDOIReserved(context, dso, doi)) {
// TODO: Send metadata update anyway!
return;
}
// check if doi is already reserved for another object
if (connector.isDOIReserved(context, doi))
{
if (connector.isDOIReserved(context, doi)) {
log.warn("Trying to reserve a DOI {} that is reserved for "
+ "another object.", doi);
throw new IdentifierException("Trying to reserve a DOI " +
"that is reserved for another object.");
throw new IdentifierException("Trying to reserve a DOI "
+ "that is reserved for another object.");
}
// try to reserve the doi
if(!connector.reserveDOI(context, dso, doi))
if (!connector.reserveDOI(context, dso, doi)) {
throw new IdentifierException("It was impossible to reserve the DOI "
+ doi + ". Take a look into the logs for further details.");
}
else
{
TableRow doiRow = DatabaseManager.findByUnique(context, "Doi",
"doi", doi.substring(DOI.SCHEME.length()));
doiRow.setColumn("status", "isReserved");
try {
DatabaseManager.update(context, doiRow);
} catch (SQLException se) { ///muss ich sehenn
System.err.println("Caught SQLException: " + se.getMessage());
se.printStackTrace(System.err);
throw se;
}
}
}
public void registeredDOIOnline(Context context, DSpaceObject dso, String identifier)
throws IdentifierException, IllegalArgumentException, SQLException {
String doi = formatIdentifier(identifier);
// check if the DOI is already registered for this dso
if (connector.isDOIRegistered(context, dso, doi))
{
return;
}
// check if DOI is registered for another object
if (connector.isDOIRegistered(context, doi)) {
log.warn("Trying to register DOI {}, that is already registered.", doi);
throw new IdentifierException("Trying to register a DOI that is "
+ "registered for another object.");
}
// check if doi is reserved for this specific dso
if (!connector.isDOIReserved(context, dso, doi)) {
// check if doi is already reserved for another dso
if (connector.isDOIReserved(context, doi)) {
log.warn("Trying to register DOI {}, that is reserved for "
+ "another dso.", doi);
throw new IdentifierException("Trying to register a DOI "
+ "that is reserved for another object.");
}
if (!connector.reserveDOI(context, dso, doi)) {
throw new IdentifierException("It was impossible to reserve the DOI "
+ doi + ". Take a look into the logs for further details.");
}
}
if (!connector.registerDOI(context, dso, doi)) {
throw new IdentifierException("It was impossible to register the DOI "
+ doi + ". Take a look into the logs for further details.");
} else {
TableRow doiRow = DatabaseManager.findByUnique(context, "Doi",
"doi", doi.substring(DOI.SCHEME.length()));
doiRow.setColumn("status", "isRegistered");
DatabaseManager.update(context, doiRow);
}
}
@Override
@@ -616,12 +728,35 @@ public class DOIIdentifierProvider
"that's not part of our Namespace!");
}
else
{
// We need to generate a new DOI.
// We can register a DOI that was not minted, so we can have DOIs
// that have not the suffix of the doi_id column.
// Generate a new doi_id and check if we already have a DOI with the
// same suffix. Try max. THRESHOLD_UNIQUE_DOI times.
int i = 0;
for ( ; i < THRESHOLD_UNIQUE_DOI ; ++i)
{
doi = this.getPrefix() + "/" + this.getNamespaceSeparator() +
doiRow.getIntColumn("doi_id");
if (null == DatabaseManager.findByUnique(context, "Doi", "doi", doi))
{
break;
}
doiRow = DatabaseManager.create(context, "Doi");
}
if (null != DatabaseManager.findByUnique(context, "Doi", "doi", doi))
{
// We were unable to find a new DOI that does noch already exist.
// TODO: throw usefull Exception
throw new RuntimeException();
}
}
doiRow.setColumn("doi", doi);
doiRow.setColumn("resource_type_id", dso.getType());
doiRow.setColumn("resource_id", dso.getID());
doiRow.setColumnNull("status");
DatabaseManager.update(context, doiRow);
return DOI.SCHEME + doi;

366
dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java Normal file
View File

@@ -0,0 +1,366 @@
/**
* 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/
*/
package org.dspace.identifier.doi;
import java.sql.SQLException;
import java.util.logging.Level;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.apache.log4j.Logger;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.DSpaceObject;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.identifier.DOI;
import org.dspace.identifier.DOIIdentifierProvider;
import org.dspace.identifier.IdentifierException;
import org.dspace.storage.rdbms.DatabaseManager;
import org.dspace.storage.rdbms.TableRow;
import org.dspace.storage.rdbms.TableRowIterator;
import org.dspace.utils.DSpace;
/**
*
* @author Marsa Haoua
*/
public class DOIOrganiser {
private static final Logger LOG = Logger.getLogger(DOIOrganiser.class);
/**
* DSpace Context object
*/
//private Context context;
/**
* Blanked off constructor, this class should be used as a command line
* tool.
*
*/
private DOIOrganiser()
// throws SQLException
{
// context = new Context();
}
public static void main(String[] args)
{
LOG.info("Starting DOI organiser ");
// set up command line and Command line parser
CommandLineParser parser = new PosixParser();
CommandLine line = null;
// create an options object
Options options = new Options();
// add option to options
options.addOption("h", "help", false, "Help");
options.addOption("l", "list", false,
"List all objects to be reserved or registered ");
options.addOption("r", "register", false,
"register all to be registered identifiers online.");
options.addOption("s", "reserve", false,
"Reserve all to be reserved identifiers online.\n");
Option registerDoi = OptionBuilder.withArgName("DOI identifier")
.hasArgs(1)
.withDescription("Register an identifier online. "
+ "An DOI identifier is needed.").create('g');
options.addOption(registerDoi);
Option reserveDoi = OptionBuilder.withArgName("DOI identifier")
.hasArgs(1)
.withDescription("Reserve an identifier online."
+ " An DOI identifier is needed. ").create('v');
options.addOption(reserveDoi);
Option registerByItemOrHandle = OptionBuilder.withArgName("ItemID or Handle")
.hasArgs(1)
.withDescription("Reserve an identifier for a given ItemID or Handle."
+ " An ItemID or a Handle is needed. ").create('t');
options.addOption(registerByItemOrHandle);
Option reserveByItemOrHandle = OptionBuilder.withArgName("ItemID or Handle")
.hasArgs(1)
.withDescription("Reserve an identifier for a given ItemID or Handle."
+ " An ItemID or a Handle is needed. ").create('i');
options.addOption(reserveByItemOrHandle);
Context context = null;
try {
context = new Context();
}
catch (SQLException sqle)
{
System.err.println("Can't connect to database: " + sqle.getMessage());
System.exit(-1);
}
// Started from commandline, don't use the authentication system.
context.turnOffAuthorisationSystem();
try
{
line = parser.parse(options, args);
}
catch (ParseException ex)
{
LOG.fatal(ex);
System.exit(1);
}
// user asks for help
if (line.hasOption('h'))
{
printHelp(options);
}
if (line.hasOption('l'))
{
listDoiTable(context);
}
if (line.hasOption('s'))
{
doiRequest(context, "toBeReserved");
}
if (line.hasOption('r'))
{
doiRequest(context, "toBeRegistered");
}
if(line.hasOption('g')){
String identifier = line.getOptionValue('g');
if(null == identifier){
LOG.info("A DOI identifier is needed");
throw new IllegalArgumentException("Identifier is null.", new NullPointerException());
}else{
doiRequestByDOI(context, identifier,"toBeRegistered");
}
}
if(line.hasOption('v')){
String identifier = line.getOptionValue('v');
if(null == identifier){
LOG.info("A DOI identifier is needed");
throw new IllegalArgumentException("Identifier is null.", new NullPointerException());
}
else
{
doiRequestByDOI(context, identifier,"toBeReserved");
}
}
if(line.hasOption('t')){
String itemID_Hdl = line.getOptionValue('t');
if(null == itemID_Hdl){
LOG.info("A ItemID or a Handle is needed");
throw new IllegalArgumentException("ItemID or Handle is null.", new NullPointerException());
}
else
{
doiRequestByItemID_Handle(context, itemID_Hdl,"toBeRegistered");
}
}
if(line.hasOption('i')){
String itemID_Hdl = line.getOptionValue('i');
if(null == itemID_Hdl){
LOG.info("A ItemID or a Handle is needed");
throw new IllegalArgumentException("ItemID or Handle is null.", new NullPointerException());
}
else
{
doiRequestByItemID_Handle(context, itemID_Hdl,"toBeReserved");
}
}
try {
context.complete();
} catch (SQLException sqle)
{
System.err.println("Cannot save changes to database: " + sqle.getMessage());
System.exit(-1);
}
LOG.info("Ending Doi organiser");
}
/**
* Print the help options for the user
*
* @param options that are available for the user
*/
private static void printHelp(Options options)
{
HelpFormatter myhelp = new HelpFormatter();
myhelp.printHelp("DOI organiser\n", options);
}
private static TableRowIterator listDoiTableByStatus(Context context, String status)
{
TableRowIterator doiIterator = null;
try
{
String sql = "Select * From Doi Where status = ?";
doiIterator = DatabaseManager.queryTable(context, "Doi", sql, status);
}
catch (SQLException ex)
{
LOG.error("Error while trying to get data from database", ex);
throw new RuntimeException("Error while trying to get data from database", ex);
}
return doiIterator;
}
private static void listDoiTable(Context context)
{
try
{
String sql = "Select * From Doi Where status = ? or status = ? ";
TableRowIterator doiIterator = DatabaseManager.queryTable(context,
"Doi", sql, "toBeReserved", "toBeRegistered");
while (doiIterator.hasNext())
{
TableRow doiRow = doiIterator.next();
System.out.println(doiRow.toString());
}
doiIterator.close();
}
catch (SQLException ex)
{
LOG.error("Error while trying to get data from database", ex);
throw new RuntimeException("Error while trying to get data from database", ex);
}
}
private static void doiRequest(Context context, String status) throws RuntimeException
{
try
{
TableRowIterator iterator = listDoiTableByStatus(context, status);
while (iterator.hasNext())
{
TableRow doiRow = iterator.next();
runRequest(context, doiRow, status);
}
iterator.close();
}
catch (SQLException ex)
{
LOG.error("Error while trying to get data from database", ex);
throw new RuntimeException("Error while trying to get data from database", ex);
}
}
private static void runRequest(Context context, TableRow doiRow, String status){
DOIIdentifierProvider doiIdentifierProvider = new DSpace().getSingletonService(DOIIdentifierProvider.class);
try {
DSpaceObject dso = DSpaceObject.find(context,
doiRow.getIntColumn("resource_type_id"),
doiRow.getIntColumn("resource_id"));
if (status.equals("toBeRegistered"))
{
doiIdentifierProvider.registeredDOIOnline(context,
dso,
doiRow.getStringColumn("doi"));
}
else
{
doiIdentifierProvider.reserveDOIOnline(context,
dso,
doiRow.getStringColumn("doi"));
}
} catch (SQLException ex) {
LOG.error("Error while trying to get data from database", ex);
throw new RuntimeException("Error while trying to get data from database", ex);
} catch (IdentifierException ex) {
LOG.error(ex);
} catch (IllegalArgumentException ex) {
LOG.error(ex);
}
}
private static void doiRequestByDOI(Context context, String identifier, String status){
try {
DOIIdentifierProvider doiIdentifierProvider = new DSpace().getSingletonService(DOIIdentifierProvider.class);
String doi = doiIdentifierProvider.formatIdentifier(identifier);
TableRow doiRow = DatabaseManager.findByUnique(context, "Doi", "doi", doi.substring(DOI.SCHEME.length()));
if(null == doiRow) LOG.error("Identifier: "+ identifier + " is not fund. ");
runRequest(context, doiRow, status);
} catch (SQLException ex) {
LOG.error("It wasn't possible to connect to the Database",ex);
} catch (IdentifierException ex) {
LOG.error(ex);
}
}
private static void doiRequestByItemID_Handle(Context context, String itemID_Hdl, String status) {
TableRow row = null;
try
{
if (itemID_Hdl.matches("\\d*"))
{
Integer itemID = Integer.valueOf(itemID_Hdl);
row = DatabaseManager.findByUnique(context, "Item", "item_id", itemID);
if (null == row) LOG.error("ItemID: " + itemID + " is not fund. ");
runRequestByItemID_Handle(context, Constants.ITEM, itemID, status);
}
else
{
row = DatabaseManager.findByUnique(context, "Handle", "handle", itemID_Hdl);
if (null == row) LOG.error("Handle: " + itemID_Hdl + " is not fund. ");
runRequestByItemID_Handle(context, row.getIntColumn("resource_type_id"), row.getIntColumn("resource_id"), status);
}
}
catch (SQLException ex)
{
LOG.error("It wasn't possible to connect to the Database", ex);
}
}
private static void runRequestByItemID_Handle(Context context,Integer resource_type_id,Integer resource_id, String status ){
DSpaceObject dso = null;
DOIIdentifierProvider doiIdentifierProvider = new DSpace().getSingletonService(DOIIdentifierProvider.class);
try {
dso = DSpaceObject.find(context, resource_type_id, resource_id);
if (status.equals("toBeRegistered")) {
doiIdentifierProvider.register(context, dso);
} else {
String identifier = doiIdentifierProvider.mint(context, dso);
dso.update();
doiIdentifierProvider.reserve(context, dso, identifier);
}
} catch (SQLException ex) {
LOG.error("It wasn't possible to connect to the Database", ex);
} catch (IdentifierException ex) {
LOG.error("It wasn't possible to reserved or to registered an Identifier for the objact", ex);
} catch (AuthorizeException ex) {
LOG.error("It wasn't possible to update the dspace objact", ex);
}
}
}

5
dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
View File

@@ -45,6 +45,7 @@ import org.dspace.services.ConfigurationService;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.Namespace;
import org.jdom.filter.ElementFilter;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
@@ -624,7 +625,7 @@ implements DOIConnector
// and we'll add it to the DSO after successful registration.
root = addDOI(doi, root);
}
else if (metadataDOI != doi)
else if (!metadataDOI.equals(doi.substring(DOI.SCHEME.length())))
{
throw new IdentifierException("DSO with type " + dso.getTypeText()
+ " and id " + dso.getID() + " already has DOI "
@@ -1122,7 +1123,7 @@ implements DOIConnector
}
private String extractDOI(Element root) {
Element doi = root.getChild("identifier");
Element doi = root.getChild("identifier", root.getNamespace());
return (null == doi) ? null : doi.getTextTrim();
}

10
dspace/config/crosswalks/DIM2DataCite.xsl
View File

@@ -188,7 +188,11 @@
<xsl:apply-templates select="//dspace:field[@mdschema='dc' and @element='rights']" />
<!-- Add descriptions. -->
<xsl:if test="//dspace:field[@mdschema='dc' and @element='description'][not(@qualifier='provenance')]">
<xsl:element name="descriptions">
<xsl:apply-templates select="//dspace:field[@mdschema='dc' and @element='description'][not(@qualifier='provenance')]" />
</xsl:element>
</xsl:if>
</resource>
</xsl:template>
@@ -196,9 +200,9 @@
<!-- Add doi identifier information. -->
<xsl:template match="dspace:field[@mdschema='dc' and @element='identifier' and starts-with(., 'doi')]">
<Identifier identifierType="DOI">
<identifier identifierType="DOI">
<xsl:value-of select="substring(., 5)"/>
</Identifier>
</identifier>
</xsl:template>
<!-- DataCite (2) :: Creator -->
@@ -315,7 +319,7 @@
<xsl:template match="//dspace:field[@mdschema='dc' and @element='type']">
<xsl:for-each select=".">
<!-- Transforming the language flags according to ISO 639-2/B & ISO 639-3 -->
<xsl:element name="ResourceType">
<xsl:element name="resourceType">
<xsl:attribute name="resourceTypeGeneral">
<xsl:choose>
<xsl:when test="string(text())='Animation'">Image</xsl:when>

8
dspace/config/launcher.xml
View File

@@ -199,6 +199,14 @@
</step>
</command>
<command>
<name>organiser</name>
<description>Run the DOI organiser</description>
<step>
<class>org.dspace.identifier.doi.DOIOrganiser</class>
</step>
</command>
<command>
<name>packager</name>
<description>Execute a packager</description>

7
dspace/config/spring/api/identifier-service.xml
View File

@@ -33,7 +33,8 @@
a DOIConnector that handle all API calls to your DOI registration
agency. Please configure a DOIConnector as well!-->
<!-- To mint DOIs with DSpace get an agreement with a DOI registration
agency, take a look into dspace.cfg, and remove this comment
agency, take a look into dspace.cfg, and remove this comment -->
<bean id="org.dspace.identifier.DOIIdentifierProvider"
class="org.dspace.identifier.DOIIdentifierProvider"
scope="singleton">
@@ -42,7 +43,7 @@
<property name="DOIConnector"
ref="org.dspace.identifier.doi.DOIConnector" />
</bean>
-->
<!-- The DOIConnector will handle the API calls to your DOI registration
agency for the DOIIdentifierProvider. If your registration agency
tells you to use DataCites API directly you can use the
@@ -52,6 +53,7 @@
DataCiteConnector won't work if EZID is your registration agency.
-->
<!-- Remove this comment to use DataCite API directly as DOIConnector.
-->
<bean id="org.dspace.identifier.doi.DOIConnector"
class="org.dspace.identifier.doi.DataCiteConnector"
scope="singleton">
@@ -61,6 +63,5 @@
<property name='DATACITE_METADATA_PATH' value='/mds/metadata/' />
<property name='disseminationCrosswalkName' value="DataCite" />
</bean>
-->
</beans>

3
dspace/etc/h2/database_schema.sql
View File

@@ -501,7 +501,8 @@ CREATE TABLE Doi
doi_id INTEGER PRIMARY KEY,
doi VARCHAR(256),
resource_type_id INTEGER,
resource_id INTEGER
resource_id INTEGER,
status VARCHAR(20)
);
-- index by handle, commonly looked up

3
dspace/etc/oracle/database_schema.sql
View File

@@ -453,7 +453,8 @@ CREATE TABLE Doi
doi_id INTEGER PRIMARY KEY,
doi VARCHAR2(256) UNIQUE,
resource_type_id INTEGER,
resource_id INTEGER
resource_id INTEGER,
status VARCHAR(20)
);
-- index by resource id and resource type id

59
dspace/etc/oracle/database_schema_30-31.sql Normal file
View File

@@ -0,0 +1,59 @@
--
-- database_schema_18-3.sql
--
-- Version: $Revision$
--
-- Date: $Date: 2012-05-29
--
-- 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/
--
--
-- SQL commands to upgrade the database schema of a live DSpace 1.8 or 1.8.x
-- to the DSpace 3 database schema
--
-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
--
ALTER TABLE resourcepolicy
ADD (
rpname VARCHAR2(30),
rptype VARCHAR2(30),
rpdescription VARCHAR2(100)
);
ALTER TABLE item ADD discoverable NUMBER(1);
CREATE TABLE versionhistory
(
versionhistory_id INTEGER NOT NULL PRIMARY KEY
);
CREATE TABLE versionitem
(
versionitem_id INTEGER NOT NULL PRIMARY KEY,
item_id INTEGER REFERENCES Item(item_id),
version_number INTEGER,
eperson_id INTEGER REFERENCES EPerson(eperson_id),
version_date TIMESTAMP,
version_summary VARCHAR2(255),
versionhistory_id INTEGER REFERENCES VersionHistory(versionhistory_id)
);
CREATE SEQUENCE versionitem_seq;
CREATE SEQUENCE versionhistory_seq;
-------------------------------------------
-- New columns and longer hash for salted password hashing DS-861 --
-------------------------------------------
ALTER TABLE EPerson modify( password VARCHAR(128));
ALTER TABLE EPerson ADD salt VARCHAR(32);
ALTER TABLE EPerson ADD digest_algorithm VARCHAR(16);

3
dspace/etc/postgres/database_schema.sql
View File

@@ -494,7 +494,8 @@ CREATE TABLE Doi
doi_id INTEGER PRIMARY KEY,
doi VARCHAR(256) UNIQUE,
resource_type_id INTEGER,
resource_id INTEGER
resource_id INTEGER,
status VARCHAR(20)
);
-- index by handle, commonly looked up

28
dspace/etc/postgres/database_schema_30-31.sql Normal file
View File

@@ -0,0 +1,28 @@
--
-- database_schema_30-31.sql
--
-- Version: $Revision$
--
-- Date: $Date: 2013-07-13
--
-- 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/
--
--
-- SQL commands to upgrade the database schema of a live DSpace 3.0 or 3.1.x
-- to the DSpace 3 database schema
--
-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
-- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
--
-------------------------------------------
-- New columns for Doi Table status --
-------------------------------------------
ALTER TABLE DOI ADD COLUMN status VARCHAR(20);