MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/dmp-refactoring' into dmp-refactoring

This commit is contained in:
George Kalampokis 2023-12-20 10:49:56 +02:00
parent acc4557836 306053acba
commit ea371cb1a1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java
View File

@ -202,13 +202,12 @@ public class DmpMigrationService {
if (licenseMap.containsKey("name")) { if (licenseMap.containsKey("name")) {
referenceEntity.setLabel(licenseMap.get("name")); referenceEntity.setLabel(licenseMap.get("name"));
} }
if (licenseMap.containsKey("uri")) { if (licenseMap.containsKey("pid")) {
referenceEntity.setReference(licenseMap.get("uri")); if (!this.conventionService.isNullOrEmpty(licensePid)){
if (!this.conventionService.isNullOrEmpty(licenseMap.get("uri"))){
FieldEntity fieldEntity = new FieldEntity(); FieldEntity fieldEntity = new FieldEntity();
fieldEntity.setCode("uri"); fieldEntity.setCode("pid");
fieldEntity.setDataType(ReferenceFieldDataType.Text); fieldEntity.setDataType(ReferenceFieldDataType.Text);
fieldEntity.setValue(licenseMap.get("uri")); fieldEntity.setValue(licensePid);
fields.add(fieldEntity); fields.add(fieldEntity);
} }
} }
@ -221,12 +220,13 @@ public class DmpMigrationService {
fields.add(fieldEntity); fields.add(fieldEntity);
} }
} }
if (licenseMap.containsKey("hint")) { if (licenseMap.containsKey("uri")) {
if (!this.conventionService.isNullOrEmpty(licenseMap.get("hint"))){ referenceEntity.setReference(licenseMap.get("uri"));
if (!this.conventionService.isNullOrEmpty(licenseMap.get("uri"))){
FieldEntity fieldEntity = new FieldEntity(); FieldEntity fieldEntity = new FieldEntity();
fieldEntity.setCode("hint"); fieldEntity.setCode("uri");
fieldEntity.setDataType(ReferenceFieldDataType.Text); fieldEntity.setDataType(ReferenceFieldDataType.Text);
fieldEntity.setValue(licenseMap.get("hint")); fieldEntity.setValue(licenseMap.get("uri"));
fields.add(fieldEntity); fields.add(fieldEntity);
} }
} }