Skip to content

Commit

Permalink
Merge pull request #3828 from IQSS/1393_exp_dcmeta
Browse files Browse the repository at this point in the history 
1393 minimal machine-readable information in dataset landing pages
  • Loading branch information
@kcondon
kcondon authored Jun 13, 2017
2 parents 02e5545 + 7a90c98 commit 07f4a58
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 41 deletions.
114 changes: 90 additions & 24 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public enum DisplayMode {
private Long ownerId;
private Long versionId;
private int selectedTabIndex;
private List<DataFile> newFiles = new ArrayList();
private List<DataFile> newFiles = new ArrayList<>();
private DatasetVersion workingVersion;
private int releaseRadio = 1;
private int deaccessionRadio = 0;
Expand All @@ -192,7 +192,7 @@ public enum DisplayMode {
private String displayCitation;
private String deaccessionForwardURLFor = "";
private String showVersionList = "false";
private List<Template> dataverseTemplates = new ArrayList();
private List<Template> dataverseTemplates = new ArrayList<>();
private Template defaultTemplate;
private Template selectedTemplate;
private String globalId;
Expand All @@ -208,14 +208,14 @@ public enum DisplayMode {

private boolean stateChanged = false;

private List<Dataverse> dataversesForLinking = new ArrayList();
private List<Dataverse> dataversesForLinking = new ArrayList<>();
private Long linkingDataverseId;
private List<SelectItem> linkingDVSelectItems;
private Dataverse linkingDataverse;

// Version tab lists
private List<DatasetVersion> versionTabList = new ArrayList();
private List<DatasetVersion> versionTabListForPostLoad = new ArrayList();
private List<DatasetVersion> versionTabList = new ArrayList<>();
private List<DatasetVersion> versionTabListForPostLoad = new ArrayList<>();


// Used to store results of permissions checks
Expand Down Expand Up @@ -496,8 +496,8 @@ public void updateReleasedVersions(){
}

public void updateLinkableDataverses() {
dataversesForLinking = new ArrayList();
linkingDVSelectItems = new ArrayList();
dataversesForLinking = new ArrayList<>();
linkingDVSelectItems = new ArrayList<>();

//Since this is a super user we are getting all dataverses
dataversesForLinking = dataverseService.findAll();
Expand Down Expand Up @@ -968,7 +968,7 @@ private void updateDatasetFieldInputLevels() {
Retrieve List of DataverseFieldTypeInputLevel objects
Use the DatasetFieldType id's which are the Map's keys
--------------------------------------------------------- */
List<Long> idList = new ArrayList<Long>(mapDatasetFields.keySet());
List<Long> idList = new ArrayList<>(mapDatasetFields.keySet());
List<DataverseFieldTypeInputLevel> dsFieldTypeInputLevels = dataverseFieldTypeInputLevelService.findByDataverseIdAndDatasetFieldTypeIdList(dvIdForInputLevel, idList);

/* ---------------------------------------------------------
Expand Down Expand Up @@ -1398,7 +1398,7 @@ private void refreshSelectedFiles(){
workingVersion = dataset.getEditVersion();
workingVersion.getTermsOfUseAndAccess().setTermsOfAccess(termsOfAccess);
workingVersion.getTermsOfUseAndAccess().setFileAccessRequest(requestAccess);
List <FileMetadata> newSelectedFiles = new ArrayList();
List <FileMetadata> newSelectedFiles = new ArrayList<>();
for (FileMetadata fmd : selectedFiles){
for (FileMetadata fmdn: workingVersion.getFileMetadatas()){
if (fmd.getDataFile().equals(fmdn.getDataFile())){
Expand Down Expand Up @@ -1465,8 +1465,8 @@ public void tabChanged(TabChangeEvent event) {
setVersionTabList(resetVersionTabList());
setReleasedVersionTabList(resetReleasedVersionTabList());
} else {
releasedVersionTabList = new ArrayList();
versionTabList = new ArrayList();
releasedVersionTabList = new ArrayList<>();
versionTabList = new ArrayList<>();
if(this.activeTabIndex == 0) {
init();
}
Expand Down Expand Up @@ -1921,7 +1921,7 @@ public void setSelectAllFiles(boolean selectAllFiles) {

public void toggleSelectedFiles(){
//method for when user clicks (de-)select all files
this.selectedFiles = new ArrayList();
this.selectedFiles = new ArrayList<>();
if(this.selectAllFiles){
for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
this.selectedFiles.add(fmd);
Expand Down Expand Up @@ -1994,8 +1994,8 @@ public String getDownloadableFilesIdsString() {
}

public void updateFileCounts(){
setSelectedUnrestrictedFiles(new ArrayList<FileMetadata>());
setSelectedRestrictedFiles(new ArrayList<FileMetadata>());
setSelectedUnrestrictedFiles(new ArrayList<>());
setSelectedRestrictedFiles(new ArrayList<>());
setTabularDataSelected(false);
for (FileMetadata fmd : this.selectedFiles){
if(fmd.isRestricted()){
Expand Down Expand Up @@ -2150,7 +2150,7 @@ public void restrictFiles(boolean restricted) {
// line is not going to work on a new file... so be mindful of all this
// when the code between the 2 beans is merged in 4.3.
if (editMode != EditMode.CREATE) {
previouslyRestrictedFiles = new ArrayList();
previouslyRestrictedFiles = new ArrayList<>();
for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
if (fmd.isRestricted()) {
previouslyRestrictedFiles.add(fmd);
Expand Down Expand Up @@ -2203,7 +2203,7 @@ public int getRestrictedFileCount() {
return restrictedFileCount;
}

private List<FileMetadata> filesToBeDeleted = new ArrayList();
private List<FileMetadata> filesToBeDeleted = new ArrayList<>();

public String deleteFilesAndSave(){
if (bulkUpdateCheckVersion()){
Expand Down Expand Up @@ -2569,7 +2569,7 @@ public void setVersionTabList(List<DatasetVersion> versionTabList) {
this.versionTabList = versionTabList;
}

private List<DatasetVersion> releasedVersionTabList = new ArrayList();
private List<DatasetVersion> releasedVersionTabList = new ArrayList<>();

public List<DatasetVersion> getReleasedVersionTabList() {
return releasedVersionTabList;
Expand Down Expand Up @@ -2676,7 +2676,7 @@ public void updateVersionDifferences(DatasetVersion newVersion, DatasetVersion o

private List<DatasetVersion> resetVersionTabList() {
//if (true)return null;
List<DatasetVersion> retList = new ArrayList();
List<DatasetVersion> retList = new ArrayList<>();

if (permissionService.on(dataset).has(Permission.ViewUnpublishedDataset)) {
for (DatasetVersion version : dataset.getVersions()) {
Expand Down Expand Up @@ -2756,7 +2756,7 @@ public String getTabularDataFileURL(Long fileid) {
}

public List< String[]> getExporters(){
List<String[]> retList = new ArrayList();
List<String[]> retList = new ArrayList<>();
String myHostURL = getDataverseSiteUrl();
for (String [] provider : ExportService.getInstance(settingsService).getExportersLabels() ){
String formatName = provider[1];
Expand Down Expand Up @@ -2934,7 +2934,7 @@ public void clearFileMetadataSelectedForTagsPopup() {
}

public List <FileMetadata> getListFileMetadataSelectedForTagsPopup(){
List<FileMetadata> retList = new ArrayList();
List<FileMetadata> retList = new ArrayList<>();
for (FileMetadata fm : selectedFiles){
retList.add(fm);
}
Expand Down Expand Up @@ -3135,14 +3135,14 @@ public String saveFileTagsAndCategories() {
if (selectedFiles != null && selectedFiles.size() > 0) {
for (FileMetadata fm : selectedFiles) {
if (fm.getDataFile().equals(fmd.getDataFile())) {
fmd.setCategories(new ArrayList());
fmd.setCategories(new ArrayList<>());
if (newCategoryName != null) {
fmd.addCategoryByName(newCategoryName);
}
// 2. Tabular DataFile Tags:
if (selectedTags != null) {
for (int i = 0; i < selectedTags.length; i++) {
fmd.addCategoryByName(selectedTags[i]);
for (String selectedTag : selectedTags) {
fmd.addCategoryByName(selectedTag);
}
}
if (fmd.getDataFile().isTabularData()) {
Expand Down Expand Up @@ -3199,7 +3199,7 @@ private void removeUnusedFileTagsFromDataset() {
}
}
}
List<DataFileCategory> datasetFileCategoriesToRemove = new ArrayList();
List<DataFileCategory> datasetFileCategoriesToRemove = new ArrayList<>();

for (DataFileCategory test : dataset.getCategories()) {
boolean remove = true;
Expand Down Expand Up @@ -3681,6 +3681,72 @@ public TwoRavensHelper getTwoRavensHelper() {
public void setTwoRavensHelper(TwoRavensHelper twoRavensHelper) {
this.twoRavensHelper = twoRavensHelper;
}

/**
* dataset title
* @return title of workingVersion
*/
public String getTitle() {
assert (null != workingVersion);
return workingVersion.getTitle();
}

/**
* dataset description
*
* @return title of workingVersion
*/
public String getDescription() {
assert (null != workingVersion);
return workingVersion.getDescription();
}

/**
* dataset publication date unpublished datasets will return an empty
* string.
*
* @return String dataset publication date (dd MMM yyyy).
*/
public String getPublicationDate() {
assert (null != workingVersion);
if (DatasetVersion.VersionState.DRAFT == workingVersion.getVersionState()) {
return "";
}
Date rel_date = workingVersion.getReleaseTime();
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
String r = fmt.format(rel_date.getTime());
return r;
}

/**
* dataset authors
*
* @return list of author names
*/
public List<String> getDatasetAuthors() {
assert (workingVersion != null);
return workingVersion.getDatasetAuthorNames();
}

/**
* dataset subjects
*
* @return array of String containing the subjects for a page
*/
public List<String> getDatasetSubjects() {
assert (null != workingVersion);
return workingVersion.getDatasetSubjects();
}

/**
* publisher (aka - name of root dataverse)
*
* @return the publisher of the version
*/
public String getPublisher() {
assert (null != workingVersion);
return workingVersion.getRootDataverseNameforCitation();
}

/*
public String getThumbnail() {
Expand Down
Loading

0 comments on commit 07f4a58

Please sign in to comment.