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

resolve cherry-pick issue

Browse Source
This commit is contained in:
Tom Desair
2016-03-31 17:43:09 +02:00
committed by dylan
parent bbb707358c
commit 0387a6f415
11 changed files with 312 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
View File

@@ -316,7 +316,31 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
@Override
public void addMetadata(Context context, T dso, MetadataField metadataField, String language, String value) throws SQLException {
addMetadata(context, dso, metadataField, language, Arrays.asList(value), null, null);
addMetadata(context, dso, metadataField, language, Arrays.asList(value));
}
@Override
public void addMetadata(Context context, T dso, MetadataField metadataField, String language, List<String> values) throws SQLException {
String fieldKey = metadataAuthorityService.makeFieldKey(metadataField.getMetadataSchema().getName(), metadataField.getElement(), metadataField.getQualifier());
if (metadataAuthorityService.isAuthorityControlled(fieldKey))
{
List<String> authorities = new ArrayList<String>();
List<Integer> confidences = new ArrayList<Integer>();
for (int i = 0; i < values.size(); ++i)
{
if(dso instanceof Item)
{
getAuthoritiesAndConfidences(fieldKey, ((Item) dso).getOwningCollection(), values, authorities, confidences, i);
}else{
getAuthoritiesAndConfidences(fieldKey, null, values, authorities, confidences, i);
}
}
addMetadata(context, dso, metadataField, language, values, authorities, confidences);
}
else
{
addMetadata(context, dso, metadataField, language, values, null, null);
}
}