Skip to content

Revert "Remove temporary additions to json export from #9175" #9694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kcondon wants to merge 1 commit into from
Closed

Revert "Remove temporary additions to json export from #9175" #9694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
.add("categories", getFileCategories(fileMetadata))
.add("embargo", embargo)
//.add("released", df.isReleased())
//.add("restricted", df.isRestricted())
.add("restricted", df.isRestricted())
.add("storageIdentifier", df.getStorageIdentifier())
.add("originalFileFormat", df.getOriginalFileFormat())
.add("originalFormatLabel", df.getOriginalFormatLabel())
Expand All @@ -691,8 +691,12 @@ public static JsonObjectBuilder json(DataFile df, FileMetadata fileMetadata) {
//---------------------------------------------
.add("md5", getMd5IfItExists(df.getChecksumType(), df.getChecksumValue()))
.add("checksum", getChecksumTypeAndValue(df.getChecksumType(), df.getChecksumValue()))
.add("fileMetadataId", fileMetadata.getId())
.add("tabularTags", getTabularFileTags(df))
.add("creationDate", df.getCreateDateFormattedYYYYMMDD());
.add("creationDate", df.getCreateDateFormattedYYYYMMDD())
.add("dataTables", df.getDataTables().isEmpty() ? null : JsonPrinter.jsonDT(df.getDataTables()))
.add("varGroups", fileMetadata.getVarGroups().isEmpty()
? null: JsonPrinter.jsonVarGroup(fileMetadata.getVarGroups()));
}

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