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

Included date values and effective flag on Context element

Browse Source
This commit is contained in:
Terry Brady
2013-10-01 12:11:25 -04:00
parent e3653224ac
commit 9ef6bf6717
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dspace-api/src/main/java/org/dspace/content/crosswalk/METSRightsCrosswalk.java
View File

@@ -13,6 +13,9 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Date;
import java.text.SimpleDateFormat;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@@ -158,24 +161,6 @@ public class METSRightsCrosswalk
//For each DSpace policy //For each DSpace policy
for(ResourcePolicy policy : policies) for(ResourcePolicy policy : policies)
{ {
// As of DSpace 3.0, policies may have an effective date range, check if a policy is effective
Date now = new Date();
if (policy.getStartDate() != null)
{
if (policy.getStartDate().after(now))
{
continue;
}
}
if (policy.getEndDate() != null)
{
if (policy.getEndDate().before(now))
{
continue;
}
}
// DSpace Policies can either reference a Group or an Individual, but not both! // DSpace Policies can either reference a Group or an Individual, but not both!
Group group = policy.getGroup(); Group group = policy.getGroup();
EPerson person = policy.getEPerson(); EPerson person = policy.getEPerson();
@@ -183,6 +168,27 @@ public class METSRightsCrosswalk
// Create our <Context> node for this policy // Create our <Context> node for this policy
Element rightsContext = new Element("Context", METSRights_NS); Element rightsContext = new Element("Context", METSRights_NS);
// As of DSpace 3.0, policies may have an effective date range, check if a policy is effective
rightsContext.setAttribute("in-effect","true");
Date now = new Date();
SimpleDateFormat iso8601 = new SimpleDateFormat("yyyy-MM-dd");
if (policy.getStartDate() != null)
{
rightsContext.setAttribute("start-date", iso8601.format(policy.getStartDate()));
if (policy.getStartDate().after(now))
{
rightsContext.setAttribute("in-effect","false");
}
}
if (policy.getEndDate() != null)
{
rightsContext.setAttribute("end-date", iso8601.format(policy.getEndDate()));
if (policy.getEndDate().before(now))
{
rightsContext.setAttribute("in-effect","false");
}
}
//First, handle Group-based policies //First, handle Group-based policies
// For Group policies we need to setup a // For Group policies we need to setup a