Still get errrors. >>> A new user has registered on SUNScholar Research Repository at http://scholar.sun.ac.za: Name: null null Email: 13377280null Date: 2014/02/10 3:18 PM SUNScholar Team Stellenbosch University Email: scho...@sun.ac.za Skype: usscholar Phone: 00 27 21 808 9139 >>> Applied the following; >>> From 9666b3bd42e567b3fb0094867bcf28b5ef2ce88e Mon Sep 17 00:00:00 2001 From: "Mark H. Wood" <mw...@iupui.edu> Date: Mon, 23 Sep 2013 17:02:33 -0400 Subject: [PATCH] Must also deal with null EPerson names when disseminating Groups. --- .../src/main/java/org/dspace/content/packager/RoleDisseminator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java index 167c3e9..84aea2a 100644 --- a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java +++ b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java @@ -334,7 +334,8 @@ private void writeGroup(Context context, DSpaceObject relatedObject, Group group { writer.writeEmptyElement(MEMBER); writer.writeAttribute(ID, String.valueOf(member.getID())); - writer.writeAttribute(NAME, member.getName()); + if (null != member.getName()) + writer.writeAttribute(NAME, member.getName()); } writer.writeEndElement(); } -- 1.8.5.1 >>> And applied; >>> From b7d34d03fe9f0bbd5206904760ea07aa8c02afb7 Mon Sep 17 00:00:00 2001 From: "Mark H. Wood" <mw...@iupui.edu> Date: Fri, 20 Sep 2013 15:30:22 -0400 Subject: [PATCH 1/2] Don't emit an EMAIL element if EPerson has a null email --- .../main/java/org/dspace/content/packager/RoleDisseminator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java index aa51ac6..167c3e9 100644 --- a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java +++ b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java @@ -444,9 +444,12 @@ private void writeEPerson(EPerson eperson, XMLStreamWriter writer, writer.writeStartElement(EPERSON); writer.writeAttribute(ID, String.valueOf(eperson.getID())); - writer.writeStartElement(EMAIL); - writer.writeCharacters(eperson.getEmail()); - writer.writeEndElement(); + if (eperson.getEmail()!=null) + { + writer.writeStartElement(EMAIL); + writer.writeCharacters(eperson.getEmail()); + writer.writeEndElement(); + } if(eperson.getNetid()!=null) { -- 1.8.5.1 From 9666b3bd42e567b3fb0094867bcf28b5ef2ce88e Mon Sep 17 00:00:00 2001 From: "Mark H. Wood" <mw...@iupui.edu> Date: Mon, 23 Sep 2013 17:02:33 -0400 Subject: [PATCH 2/2] Must also deal with null EPerson names when disseminating Groups. --- .../src/main/java/org/dspace/content/packager/RoleDisseminator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java index 167c3e9..84aea2a 100644 --- a/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java +++ b/dspace-api/src/main/java/org/dspace/content/packager/RoleDisseminator.java @@ -334,7 +334,8 @@ private void writeGroup(Context context, DSpaceObject relatedObject, Group group { writer.writeEmptyElement(MEMBER); writer.writeAttribute(ID, String.valueOf(member.getID())); - writer.writeAttribute(NAME, member.getName()); + if (null != member.getName()) + writer.writeAttribute(NAME, member.getName()); } writer.writeEndElement(); } -- 1.8.5.1 >>> Cheers hg
|