hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-10 11:33:11 +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/MetadataSchemaServiceImpl.java
View File

@@ -73,7 +73,7 @@ public class MetadataSchemaServiceImpl implements MetadataSchemaService {
metadataSchemaDAO.save(context, metadataSchema);
log.info(LogManager.getHeader(context, "create_metadata_schema",
"metadata_schema_id="
+ metadataSchema.getSchemaID()));
+ metadataSchema.getID()));
return metadataSchema;
}
@@ -92,21 +92,21 @@ public class MetadataSchemaServiceImpl implements MetadataSchemaService {
}
// Ensure the schema name is unique
if (!uniqueShortName(context, metadataSchema.getSchemaID(), metadataSchema.getName()))
if (!uniqueShortName(context, metadataSchema.getID(), metadataSchema.getName()))
{
throw new NonUniqueMetadataException("Please make the name " + metadataSchema.getName()
+ " unique");
}
// Ensure the schema namespace is unique
if (!uniqueNamespace(context, metadataSchema.getSchemaID(), metadataSchema.getNamespace()))
if (!uniqueNamespace(context, metadataSchema.getID(), metadataSchema.getNamespace()))
{
throw new NonUniqueMetadataException("Please make the namespace " + metadataSchema.getNamespace()
+ " unique");
}
metadataSchemaDAO.save(context, metadataSchema);
log.info(LogManager.getHeader(context, "update_metadata_schema",
"metadata_schema_id=" + metadataSchema.getSchemaID() + "namespace="
"metadata_schema_id=" + metadataSchema.getID() + "namespace="
+ metadataSchema.getNamespace() + "name=" + metadataSchema.getName()));
}
@@ -120,7 +120,7 @@ public class MetadataSchemaServiceImpl implements MetadataSchemaService {
}
log.info(LogManager.getHeader(context, "delete_metadata_schema",
"metadata_schema_id=" + metadataSchema.getSchemaID()));
"metadata_schema_id=" + metadataSchema.getID()));
metadataSchemaDAO.delete(context, metadataSchema);
}