From cc0a42b9ab006220f426b5aa39234a978c9cb7fc Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 17 Apr 2023 15:26:40 +0200 Subject: [PATCH] in progress on #24166 --- .../Geoportal_JSON_Mapper.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/application/geoportaldatamapper/Geoportal_JSON_Mapper.java b/src/main/java/org/gcube/application/geoportaldatamapper/Geoportal_JSON_Mapper.java index 5dad24d..a249081 100644 --- a/src/main/java/org/gcube/application/geoportaldatamapper/Geoportal_JSON_Mapper.java +++ b/src/main/java/org/gcube/application/geoportaldatamapper/Geoportal_JSON_Mapper.java @@ -113,7 +113,7 @@ public class Geoportal_JSON_Mapper { String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET); List listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc); FilesetDV filesetDV = new FilesetDV(); - filesetDV.setName(FILESET); + filesetDV.setGcubeProfileFieldName(FILESET); for (Payload payload : listPayloads) { PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload); filesetDV.addPayloadDV(payloadDV); @@ -298,7 +298,8 @@ public class Geoportal_JSON_Mapper { String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, filePath.getFieldName()); List listPayloads = readPayloadsForFileset(filesetJSONPath, fromSectionDocJSON); FilesetDV filesetDV = new FilesetDV(); - filesetDV.setName(filePath.getGcubeProfileFieldName()); + filesetDV.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName()); + filesetDV.setFilesetFieldName(filePath.getFieldName()); for (Payload payload : listPayloads) { PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload); filesetDV.addPayloadDV(payloadDV); @@ -411,7 +412,7 @@ public class Geoportal_JSON_Mapper { String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET); List listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc); FilesetDV filesetDV = new FilesetDV(); - filesetDV.setName(FILESET); + filesetDV.setGcubeProfileFieldName(FILESET); for (Payload payload : listPayloads) { PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload); filesetDV.addPayloadDV(payloadDV); @@ -573,11 +574,13 @@ public class Geoportal_JSON_Mapper { boolean isImage = ImageDetector.isImage(payload.getMimetype()); if (isImage) { - filesetImages.setName(filePath.getGcubeProfileFieldName()); + filesetImages.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName()); filesetImages.addPayloadDV(payloadDV); + filesetFiles.setFilesetFieldName(filePath.getFieldName()); } else { filesetFiles.addPayloadDV(payloadDV); - filesetFiles.setName(filePath.getGcubeProfileFieldName()); + filesetFiles.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName()); + filesetFiles.setFilesetFieldName(filePath.getFieldName()); } } @@ -1045,7 +1048,7 @@ public class Geoportal_JSON_Mapper { System.out.println("***** Files"); if (subDocument.getListFiles() != null) { for (FilesetDV filesetDV : subDocument.getListFiles()) { - System.out.println("******* File Fileset name: " + filesetDV.getName()); + System.out.println("******* File Fileset name: " + filesetDV.getGcubeProfileFieldName()); for (PayloadDV payload : filesetDV.getListPayload()) { System.out.println("********* Payload: " + payload); } @@ -1054,7 +1057,7 @@ public class Geoportal_JSON_Mapper { System.out.println("***** Images"); if (subDocument.getListImages() != null) { for (FilesetDV filesetDV : subDocument.getListImages()) { - System.out.println("******* Image Fileset name: " + filesetDV.getName()); + System.out.println("******* Image Fileset name: " + filesetDV.getGcubeProfileFieldName()); for (PayloadDV payload : filesetDV.getListPayload()) { System.out.println("********* Payload: " + payload); } @@ -1095,7 +1098,7 @@ public class Geoportal_JSON_Mapper { System.out.println("***** Files"); for (FilesetDV fileSet : mpb.getListFileset()) { System.out.println( - "## " + FilesetDV.class.getSimpleName() + " n." + i + " has name: " + fileSet.getName()); + "## " + FilesetDV.class.getSimpleName() + " n." + i + " has name: " + fileSet.getGcubeProfileFieldName()); if (fileSet.getListPayload() != null) { int j = 0;