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

fix conflict

Browse Source
This commit is contained in:
Tom Desair
2016-04-07 16:31:10 +02:00
committed by dylan
parent b19189634d
commit 8db0faed33
102 changed files with 665 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/content/MetadataFieldServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class MetadataFieldServiceImpl implements MetadataFieldService {
if (hasElement(context, -1, metadataSchema, element, qualifier))
{
throw new NonUniqueMetadataException("Please make " + element + "."
+ qualifier + " unique within schema #" + metadataSchema.getSchemaID());
+ qualifier + " unique within schema #" + metadataSchema.getID());
}
// Create a table row and update it with the values
@@ -71,7 +71,7 @@ public class MetadataFieldServiceImpl implements MetadataFieldService {
metadataFieldDAO.save(context, metadataField);
log.info(LogManager.getHeader(context, "create_metadata_field",
"metadata_field_id=" + metadataField.getFieldID()));
"metadata_field_id=" + metadataField.getID()));
return metadataField;
}
@@ -118,7 +118,7 @@ public class MetadataFieldServiceImpl implements MetadataFieldService {
}
// Ensure the element and qualifier are unique within a given schema.
if (hasElement(context, metadataField.getFieldID(), metadataField.getMetadataSchema(), metadataField.getElement(), metadataField.getQualifier()))
if (hasElement(context, metadataField.getID(), metadataField.getMetadataSchema(), metadataField.getElement(), metadataField.getQualifier()))
{
throw new NonUniqueMetadataException("Please make " + metadataField.getMetadataSchema().getName() + "." + metadataField.getElement() + "."
+ metadataField.getQualifier());
@@ -127,7 +127,7 @@ public class MetadataFieldServiceImpl implements MetadataFieldService {
metadataFieldDAO.save(context, metadataField);
log.info(LogManager.getHeader(context, "update_metadatafieldregistry",
"metadata_field_id=" + metadataField.getFieldID() + "element=" + metadataField.getElement()
"metadata_field_id=" + metadataField.getID() + "element=" + metadataField.getElement()
+ "qualifier=" + metadataField.getQualifier()));
}
@@ -141,7 +141,7 @@ public class MetadataFieldServiceImpl implements MetadataFieldService {
}
log.info(LogManager.getHeader(context, "delete_metadata_field",
"metadata_field_id=" + metadataField.getFieldID()));
"metadata_field_id=" + metadataField.getID()));
metadataValueService.deleteByMetadataField(context, metadataField);
metadataFieldDAO.delete(context, metadataField);