in progress on #24166
This commit is contained in:
parent
4f799628e0
commit
cc0a42b9ab
|
@ -113,7 +113,7 @@ public class Geoportal_JSON_Mapper {
|
||||||
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET);
|
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET);
|
||||||
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc);
|
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc);
|
||||||
FilesetDV filesetDV = new FilesetDV();
|
FilesetDV filesetDV = new FilesetDV();
|
||||||
filesetDV.setName(FILESET);
|
filesetDV.setGcubeProfileFieldName(FILESET);
|
||||||
for (Payload payload : listPayloads) {
|
for (Payload payload : listPayloads) {
|
||||||
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
|
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
|
||||||
filesetDV.addPayloadDV(payloadDV);
|
filesetDV.addPayloadDV(payloadDV);
|
||||||
|
@ -298,7 +298,8 @@ public class Geoportal_JSON_Mapper {
|
||||||
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, filePath.getFieldName());
|
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, filePath.getFieldName());
|
||||||
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, fromSectionDocJSON);
|
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, fromSectionDocJSON);
|
||||||
FilesetDV filesetDV = new FilesetDV();
|
FilesetDV filesetDV = new FilesetDV();
|
||||||
filesetDV.setName(filePath.getGcubeProfileFieldName());
|
filesetDV.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName());
|
||||||
|
filesetDV.setFilesetFieldName(filePath.getFieldName());
|
||||||
for (Payload payload : listPayloads) {
|
for (Payload payload : listPayloads) {
|
||||||
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
|
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
|
||||||
filesetDV.addPayloadDV(payloadDV);
|
filesetDV.addPayloadDV(payloadDV);
|
||||||
|
@ -411,7 +412,7 @@ public class Geoportal_JSON_Mapper {
|
||||||
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET);
|
String filesetJSONPath = String.format("%s.%s", JSON_$_POINTER, FILESET);
|
||||||
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc);
|
List<Payload> listPayloads = readPayloadsForFileset(filesetJSONPath, wholeSectionDoc);
|
||||||
FilesetDV filesetDV = new FilesetDV();
|
FilesetDV filesetDV = new FilesetDV();
|
||||||
filesetDV.setName(FILESET);
|
filesetDV.setGcubeProfileFieldName(FILESET);
|
||||||
for (Payload payload : listPayloads) {
|
for (Payload payload : listPayloads) {
|
||||||
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
|
PayloadDV payloadDV = ConvertToDataValueObjectModel.toPayloadDV(payload);
|
||||||
filesetDV.addPayloadDV(payloadDV);
|
filesetDV.addPayloadDV(payloadDV);
|
||||||
|
@ -573,11 +574,13 @@ public class Geoportal_JSON_Mapper {
|
||||||
boolean isImage = ImageDetector.isImage(payload.getMimetype());
|
boolean isImage = ImageDetector.isImage(payload.getMimetype());
|
||||||
|
|
||||||
if (isImage) {
|
if (isImage) {
|
||||||
filesetImages.setName(filePath.getGcubeProfileFieldName());
|
filesetImages.setGcubeProfileFieldName(filePath.getGcubeProfileFieldName());
|
||||||
filesetImages.addPayloadDV(payloadDV);
|
filesetImages.addPayloadDV(payloadDV);
|
||||||
|
filesetFiles.setFilesetFieldName(filePath.getFieldName());
|
||||||
} else {
|
} else {
|
||||||
filesetFiles.addPayloadDV(payloadDV);
|
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");
|
System.out.println("***** Files");
|
||||||
if (subDocument.getListFiles() != null) {
|
if (subDocument.getListFiles() != null) {
|
||||||
for (FilesetDV filesetDV : subDocument.getListFiles()) {
|
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()) {
|
for (PayloadDV payload : filesetDV.getListPayload()) {
|
||||||
System.out.println("********* Payload: " + payload);
|
System.out.println("********* Payload: " + payload);
|
||||||
}
|
}
|
||||||
|
@ -1054,7 +1057,7 @@ public class Geoportal_JSON_Mapper {
|
||||||
System.out.println("***** Images");
|
System.out.println("***** Images");
|
||||||
if (subDocument.getListImages() != null) {
|
if (subDocument.getListImages() != null) {
|
||||||
for (FilesetDV filesetDV : subDocument.getListImages()) {
|
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()) {
|
for (PayloadDV payload : filesetDV.getListPayload()) {
|
||||||
System.out.println("********* Payload: " + payload);
|
System.out.println("********* Payload: " + payload);
|
||||||
}
|
}
|
||||||
|
@ -1095,7 +1098,7 @@ public class Geoportal_JSON_Mapper {
|
||||||
System.out.println("***** Files");
|
System.out.println("***** Files");
|
||||||
for (FilesetDV fileSet : mpb.getListFileset()) {
|
for (FilesetDV fileSet : mpb.getListFileset()) {
|
||||||
System.out.println(
|
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) {
|
if (fileSet.getListPayload() != null) {
|
||||||
int j = 0;
|
int j = 0;
|
||||||
|
|
Loading…
Reference in New Issue