Skip to content
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

Jump to bottom

Remove temporary additions to json export from #9175 #9677

Merged
merged 2 commits into from
Jul 5, 2023
Merged

Remove temporary additions to json export from #9175 #9677

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc710e2
remove temporary additions to json export
qqmyers Jun 22, 2023
55ec209
Merge remote-tracking branch 'IQSS/develop' into DANS-external_exporters
qqmyers Jul 5, 2023
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: 2 additions & 6 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,12 +691,8 @@ 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("dataTables", df.getDataTables().isEmpty() ? null : JsonPrinter.jsonDT(df.getDataTables()))
.add("varGroups", fileMetadata.getVarGroups().isEmpty()
? null: JsonPrinter.jsonVarGroup(fileMetadata.getVarGroups()));
.add("creationDate", df.getCreateDateFormattedYYYYMMDD());
}

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