Skip to content

Commit

Permalink
merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
qqmyers committed Mar 7, 2025
1 parent 9c2c355 commit 78c3cf8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
4 changes: 4 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/DataCitation.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class DataCitation {
private boolean direct;
private List<String> funders;
private List<String> seriesTitles;
private String description;
private List<String> datesOfCollection;
private List<String> keywords;
private List<String> kindsOfData;
Expand Down Expand Up @@ -139,6 +140,9 @@ public DataCitation(FileMetadata fm, boolean direct) {
fileTitle = fm.getLabelForOriginal();
DataFile df = fm.getDataFile();

// File description
description = fm.getDescription();

// The Global Identifier of the Datafile (if published and isDirect==true) or Dataset as appropriate
persistentId = getPIDFrom(dsv, df);

Expand Down
7 changes: 0 additions & 7 deletions src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -2177,13 +2177,6 @@ public void removeCurationStatus(CurationStatus curationStatus) {
curationStatus.setDatasetVersion(null);
}

public String getCreationNote() {
return creationNote;
}

public void setCreationNote(String creationNote) {
this.creationNote = creationNote;
}
public CurationStatus getCurationStatusAsOfDate(Date date) {
if (curationStatuses == null || curationStatuses.isEmpty()) {
return null;
Expand Down

0 comments on commit 78c3cf8

Please sign in to comment.