Skip to content

Commit fe1091c

Browse files
authored
Revert "Remove temporary additions to json export from #9175"
1 parent f98636d commit fe1091c

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
672672
.add("categories", getFileCategories(fileMetadata))
673673
.add("embargo", embargo)
674674
//.add("released", df.isReleased())
675-
//.add("restricted", df.isRestricted())
675+
.add("restricted", df.isRestricted())
676676
.add("storageIdentifier", df.getStorageIdentifier())
677677
.add("originalFileFormat", df.getOriginalFileFormat())
678678
.add("originalFormatLabel", df.getOriginalFormatLabel())
@@ -691,8 +691,12 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
691691
//---------------------------------------------
692692
.add("md5", getMd5IfItExists(df.getChecksumType(), df.getChecksumValue()))
693693
.add("checksum", getChecksumTypeAndValue(df.getChecksumType(), df.getChecksumValue()))
694+
.add("fileMetadataId", fileMetadata.getId())
694695
.add("tabularTags", getTabularFileTags(df))
695-
.add("creationDate", df.getCreateDateFormattedYYYYMMDD());
696+
.add("creationDate", df.getCreateDateFormattedYYYYMMDD())
697+
.add("dataTables", df.getDataTables().isEmpty() ? null : JsonPrinter.jsonDT(df.getDataTables()))
698+
.add("varGroups", fileMetadata.getVarGroups().isEmpty()
699+
? null: JsonPrinter.jsonVarGroup(fileMetadata.getVarGroups()));
696700
}
697701

698702
//Started from https://github.com/RENCI-NRIG/dataverse/, i.e. https://github.com/RENCI-NRIG/dataverse/commit/2b5a1225b42cf1caba85e18abfeb952171c6754a

0 commit comments

Comments
 (0)