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

Quick Fix for DS-777 : PackageUtils.translateGroupNameForExport returns null unexpectedly

Browse Source 
This fix actually updates METSRightsCrosswalk so that it better supports cases where  PackageUtils.translateGroupNameForExport() returns null.

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5936 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Tim Donohue
2010-12-09 22:55:30 +00:00
parent fbc2e07d76
commit 3ee0ecaadc
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,8 +171,6 @@ public class METSRightsCrosswalk
// <Context CONTEXTCLASS='[group-type]'><UserName USERTYPE='GROUP'>[group-name]</UserName>... // <Context CONTEXTCLASS='[group-type]'><UserName USERTYPE='GROUP'>[group-name]</UserName>...
if(group != null) if(group != null)
{ {
rightsMD.addContent(rightsContext);
//Default all DSpace groups to have "MANAGED GRP" as the type //Default all DSpace groups to have "MANAGED GRP" as the type
String contextClass=GROUP_CONTEXTCLASS; String contextClass=GROUP_CONTEXTCLASS;
@@ -193,14 +191,27 @@ public class METSRightsCrosswalk
{ {
try try
{ {
//Create <UserName USERTYPE='GROUP'> element. Add the Group's name to that element //Translate the Group name for export. This ensures that groups with Internal IDs in their names
// But first, make sure to crosswalk all DSpace Default Group names: // (e.g. COLLECTION_1_ADMIN) are properly translated using the corresponding Handle or external identifier.
// e.g. translate COLLECTION_<ID>_ADMIN to COLLECTION_<handle>_ADMIN , String exportGroupName = PackageUtils.translateGroupNameForExport(context, group.getName());
// as internal IDs are meaningless once content is outside of DSpace
Element rightsUser = new Element("UserName", METSRights_NS); //If translated group name is returned as "null", this means the Group name
rightsUser.setAttribute("USERTYPE",GROUP_USERTYPE); // had an Internal Collection/Community ID embedded, which could not be
rightsUser.addContent(PackageUtils.translateGroupNameForExport(context, group.getName())); // translated properly to a Handle. We will NOT export these groups,
rightsContext.addContent(rightsUser); // as they could cause conflicts or data integrity problems if they are
// imported into another DSpace system.
if(exportGroupName!=null && !exportGroupName.isEmpty())
{
//Create <UserName USERTYPE='GROUP'> element. Add the Group's name to that element
Element rightsUser = new Element("UserName", METSRights_NS);
rightsUser.setAttribute("USERTYPE",GROUP_USERTYPE);
rightsUser.addContent(exportGroupName);
rightsContext.addContent(rightsUser);
}
else
//Skip over this Group, as we couldn't translate it for export.
//The Group seems to refer to a Community or Collection which no longer exists
continue;
} }
catch(PackageException pe) catch(PackageException pe)
{ {
@@ -209,14 +220,15 @@ public class METSRightsCrosswalk
throw new CrosswalkException(pe); throw new CrosswalkException(pe);
} }
} }
rightsMD.addContent(rightsContext);
}//end if group }//end if group
//Next, handle User-based policies //Next, handle User-based policies
// For User policies we need to setup a // For User policies we need to setup a
// <Context CONTEXTCLASS='ACADEMIC USER'><UserName USERTYPE='INDIVIDUAL'>[group-name]</UserName>... // <Context CONTEXTCLASS='ACADEMIC USER'><UserName USERTYPE='INDIVIDUAL'>[group-name]</UserName>...
else if(person!=null) else if(person!=null)
{ {
rightsMD.addContent(rightsContext);
// All EPeople are considered 'Academic Users' // All EPeople are considered 'Academic Users'
rightsContext.setAttribute("CONTEXTCLASS", PERSON_CONTEXTCLASS); rightsContext.setAttribute("CONTEXTCLASS", PERSON_CONTEXTCLASS);
@@ -225,6 +237,8 @@ public class METSRightsCrosswalk
rightsUser.setAttribute("USERTYPE",PERSON_USERTYPE); rightsUser.setAttribute("USERTYPE",PERSON_USERTYPE);
rightsUser.addContent(person.getEmail()); rightsUser.addContent(person.getEmail());
rightsContext.addContent(rightsUser); rightsContext.addContent(rightsUser);
rightsMD.addContent(rightsContext);
}//end if person }//end if person
else else
log.error("Policy " + String.valueOf(policy.getID()) log.error("Policy " + String.valueOf(policy.getID())