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

DS-3086-fix

Browse Source
This commit is contained in:
dylan
2016-03-01 13:27:41 +01:00
parent ec6a4d2aaa
commit bee3f00479
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/EditCollectionHarvestingForm.java
View File

@@ -139,8 +139,8 @@ public class EditCollectionHarvestingForm extends AbstractDSpaceTransformer
// The big complex way of getting to our metadata // The big complex way of getting to our metadata
settings.addLabel(T_label_metadata_format); settings.addLabel(T_label_metadata_format);
String key = "harvester.oai.metadataformats." + metadataFormatValue; String key = "oai.harvester.metadataformats." + metadataFormatValue;
String metadataString = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("oai." + key); String metadataString = (DSpaceServicesFactory.getInstance().getConfigurationService().getProperty(key));
String displayName; String displayName;
if (metadataString.indexOf(',') != -1) if (metadataString.indexOf(',') != -1)
@@ -157,8 +157,8 @@ public class EditCollectionHarvestingForm extends AbstractDSpaceTransformer
settings.addLabel(T_label_harvest_level); settings.addLabel(T_label_harvest_level);
Item harvestLevel = settings.addItem(); Item harvestLevel = settings.addItem();
switch (harvestLevelValue) { switch (harvestLevelValue) {
case 1: harvestLevel.addContent(T_option_md_only); break; case HarvestedCollection.TYPE_DMD: harvestLevel.addContent(T_option_md_only); break;
case 2: harvestLevel.addContent(T_option_md_and_ref); break; case HarvestedCollection.TYPE_DMDREF: harvestLevel.addContent(T_option_md_and_ref); break;
default: harvestLevel.addContent(T_option_md_and_bs); break; default: harvestLevel.addContent(T_option_md_and_bs); break;
} }

4
dspace-xmlui/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/SetupCollectionHarvestingForm.java
View File

@@ -215,13 +215,13 @@ public class SetupCollectionHarvestingForm extends AbstractDSpaceTransformer
// Add an entry for each instance of ingestion crosswalks configured for harvesting // Add an entry for each instance of ingestion crosswalks configured for harvesting
String metaString = "harvester.oai.metadataformats."; String metaString = "oai.harvester.metadataformats.";
Enumeration pe = Collections.enumeration(DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyKeys("oai")); Enumeration pe = Collections.enumeration(DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyKeys("oai"));
while (pe.hasMoreElements()) while (pe.hasMoreElements())
{ {
String key = (String)pe.nextElement(); String key = (String)pe.nextElement();
if (key.startsWith(metaString)) { if (key.startsWith(metaString)) {
String metadataString = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("oai." + key); String metadataString = (DSpaceServicesFactory.getInstance().getConfigurationService().getProperty(key));
String metadataKey = key.substring(metaString.length()); String metadataKey = key.substring(metaString.length());
String displayName; String displayName;