fixing #25275
This commit is contained in:
parent
2d4488703a
commit
cb29e33652
|
@ -329,9 +329,9 @@ public class BasicInformationView extends Composite implements FormValidator {
|
|||
// License
|
||||
if (zMeta.getLicenses() != null) {
|
||||
List<String> listLicensesIds = null;
|
||||
List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenses());
|
||||
if(zMeta.getLicenses()!=null) {
|
||||
listLicensesIds = FieldUtil.toZenodoIds(zMeta.getLicenses());
|
||||
List<String> selectedLicensesId = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectedValues());
|
||||
if(zMeta.getLicenses().getSelectableValues()!=null) {
|
||||
listLicensesIds = FieldUtil.toZenodoIds(zMeta.getLicenses().getSelectableValues());
|
||||
FieldUtil.addValuesToListBox(field_license, listLicensesIds);
|
||||
field_license.setEnabled(true);
|
||||
}else {
|
||||
|
|
|
@ -163,8 +163,8 @@ public class Ckan2ZenodoViewManager {
|
|||
String licenseId = basicForm.getField_license().getSelectedValue();
|
||||
if(licenseId!=null) {
|
||||
LicenseBean licenseBean = new LicenseBean(licenseId, null, null);
|
||||
//meta.setLicenses(new SerializableEnum<LicenseBean>(Arrays.asList(licenseBean),null));
|
||||
meta.setLicenses(Arrays.asList(licenseBean));
|
||||
meta.setLicenses(new SerializableEnum<LicenseBean>(Arrays.asList(licenseBean),null));
|
||||
//meta.setLicenses(Arrays.asList(licenseBean));
|
||||
}
|
||||
|
||||
//embargo date
|
||||
|
|
|
@ -180,17 +180,25 @@ public class CkanToZenodoPublisherServiceImpl extends RemoteServiceServlet imple
|
|||
ItemTranslateError itemTrError = null;
|
||||
try {
|
||||
zdDeposition = client.translate(itemDescr);
|
||||
} catch (ConfigurationException e) {
|
||||
} catch (ConfigurationException | TransformationException e) {
|
||||
LOG.info(ConfigurationException.class.getSimpleName() + " thrown, trying to use forceTranslation for: "
|
||||
+ itemDescr.getName());
|
||||
itemTrError = new ItemTranslateError(e.getMessage(), ERROR_TYPE.INFO);
|
||||
zdDeposition = client.forceTranslation(itemDescr);
|
||||
}
|
||||
|
||||
//fixing issue #25275
|
||||
List<CkanResource> filteredResources = null;
|
||||
try {
|
||||
// Loading Filtered resources according to VRE policies
|
||||
List<CkanResource> filteredResources = loadFilterResources(item.getItemId());
|
||||
|
||||
filteredResources = loadFilterResources(item.getItemId());
|
||||
LOG.debug("Loaded filtered resources: " + filteredResources);
|
||||
} catch (ConfigurationException | TransformationException e) {
|
||||
LOG.info(ConfigurationException.class.getSimpleName() + " thrown, registering loadFilterResources error: "
|
||||
+ itemDescr.getName());
|
||||
itemTrError = new ItemTranslateError(e.getMessage(), ERROR_TYPE.INFO);
|
||||
//zdDeposition = client.forceTranslation(itemDescr);
|
||||
}
|
||||
|
||||
// Converting ZenodoDeposition to ZenodoItem
|
||||
ZenodoItem zenodoItem = ItemToZenodoConverter.toZenodoItem(zdDeposition);
|
||||
|
|
|
@ -240,8 +240,8 @@ public class ItemToZenodoConverter {
|
|||
selectedLicenses = Arrays.asList(new LicenseBean(depositionMetadata.getLicense(),depositionMetadata.getLicense(), null));
|
||||
}
|
||||
if(selectedLicenses!=null) {
|
||||
zm.setLicenses(selectedLicenses); //NEED TO ADD ALL LICENSES
|
||||
//zm.setLicenses(CkanToZenodoUtil.licenseToSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES
|
||||
zm.setLicenses(CkanToZenodoUtil.licenseToSerializableEnum(selectedLicenses, null)); //NEED TO ADD ALL LICENSES
|
||||
//zm.setLicenses(selectedLicenses); //NEED TO ADD ALL LICENSES
|
||||
}
|
||||
|
||||
if(depositionMetadata.getEmbargo_date()!=null) {
|
||||
|
@ -528,11 +528,11 @@ public class ItemToZenodoConverter {
|
|||
}
|
||||
|
||||
//license
|
||||
List<LicenseBean> licenses = metadata.getLicenses();
|
||||
SerializableEnum<LicenseBean> licenses = metadata.getLicenses();
|
||||
LOG.debug("Read licenses: "+licenses);
|
||||
if(licenses!=null) {
|
||||
try {
|
||||
LicenseBean lB = licenses.get(0);
|
||||
LicenseBean lB = licenses.getSelectedValues().get(0);
|
||||
LOG.debug("Set license: "+lB);
|
||||
depositionMetadata.setLicense(lB.getId());
|
||||
}catch (Exception e) {
|
||||
|
|
|
@ -77,9 +77,7 @@ public class ZenodoMetadata implements Serializable {
|
|||
private List<ZenodoDateInterval> dates;
|
||||
private String method; // TODO html
|
||||
|
||||
private List<LicenseBean> licenses;
|
||||
|
||||
private List<LicenseBean> allLicenses;
|
||||
private SerializableEnum<LicenseBean> licenses;
|
||||
|
||||
/**
|
||||
* Instantiates a new zenodo metadata.
|
||||
|
@ -884,37 +882,19 @@ public class ZenodoMetadata implements Serializable {
|
|||
*
|
||||
* @param licenses the new licenses
|
||||
*/
|
||||
public void setLicenses(List<LicenseBean> licenses) {
|
||||
public void setLicenses(SerializableEnum<LicenseBean> licenses) {
|
||||
this.licenses = licenses;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the licenses. The selectable values
|
||||
* Gets the licenses.
|
||||
*
|
||||
* @return the licenses
|
||||
*/
|
||||
public List<LicenseBean> getLicenses() {
|
||||
public SerializableEnum<LicenseBean> getLicenses() {
|
||||
return licenses;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the all licenses.
|
||||
*
|
||||
* @return the all licenses
|
||||
*/
|
||||
public void getAllLicenses() {
|
||||
this.allLicenses = licenses;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the licenses.
|
||||
*
|
||||
* @param licenses the new licenses
|
||||
*/
|
||||
public void setAllLicenses(List<LicenseBean> licenses) {
|
||||
this.allLicenses = licenses;
|
||||
}
|
||||
|
||||
/**
|
||||
* To string.
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue