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

D4CRIS-338 save granted date into dcterms.accessRights (was dc.rights.date)

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2017-11-15 11:39:13 +01:00
parent 7a3532993f
commit 3e77e73fc2
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/content/Bitstream.java
View File

@@ -447,7 +447,7 @@ public class Bitstream extends DSpaceObject implements DSpaceObjectLegacySupport
* @throws SQLException * @throws SQLException
*/ */
public void setAcceptanceDate(Context context, DCDate acceptanceDate) throws SQLException { public void setAcceptanceDate(Context context, DCDate acceptanceDate) throws SQLException {
getBitstreamService().setMetadataSingleValue(context, this, MetadataSchema.DC_SCHEMA, "rights", "date", null, acceptanceDate.toString()); getBitstreamService().setMetadataSingleValue(context, this, "dcterms", "accessRights", null, null, acceptanceDate.toString());
} }
} }

4
dspace-spring-rest/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java
View File

@@ -35,14 +35,14 @@ import org.springframework.data.rest.webmvc.json.patch.LateObjectEvaluator;
*/ */
public class LicenseStep extends org.dspace.submit.step.LicenseStep implements AbstractRestProcessingStep { public class LicenseStep extends org.dspace.submit.step.LicenseStep implements AbstractRestProcessingStep {
private static final String DC_RIGHTS_DATE = "dc.rights.date"; private static final String DCTERMS_RIGHTSDATE = "dcterms.accessRights";
@Override @Override
public DataLicense getData(WorkspaceItem obj, SubmissionStepConfig config) throws Exception { public DataLicense getData(WorkspaceItem obj, SubmissionStepConfig config) throws Exception {
DataLicense result = new DataLicense(); DataLicense result = new DataLicense();
Bitstream bitstream = bitstreamService.getBitstreamByName(obj.getItem(), Constants.LICENSE_BUNDLE_NAME, Constants.LICENSE_BITSTREAM_NAME); Bitstream bitstream = bitstreamService.getBitstreamByName(obj.getItem(), Constants.LICENSE_BUNDLE_NAME, Constants.LICENSE_BITSTREAM_NAME);
if(bitstream!=null) { if(bitstream!=null) {
String acceptanceDate = bitstreamService.getMetadata(bitstream, DC_RIGHTS_DATE); String acceptanceDate = bitstreamService.getMetadata(bitstream, DCTERMS_RIGHTSDATE);
result.setAcceptanceDate(acceptanceDate); result.setAcceptanceDate(acceptanceDate);
result.setUrl(configurationService.getProperty("dspace.url")+"/api/"+BitstreamRest.CATEGORY +"/"+ English.plural(BitstreamRest.NAME) + "/" + bitstream.getID() + "/content"); result.setUrl(configurationService.getProperty("dspace.url")+"/api/"+BitstreamRest.CATEGORY +"/"+ English.plural(BitstreamRest.NAME) + "/" + bitstream.getID() + "/content");
} }

7
dspace/config/registries/dublin-core-types.xml
View File

@@ -590,10 +590,5 @@
<qualifier>license</qualifier> <qualifier>license</qualifier>
<scope_note></scope_note> <scope_note></scope_note>
</dc-type> </dc-type>
<dc-type>
<schema>dc</schema>
<element>rights</element>
<qualifier>date</qualifier>
<scope_note></scope_note>
</dc-type>
</dspace-dc-types> </dspace-dc-types>