Skip to content

IQSS/7956 show original file format #12145

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

Open
qqmyers wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

IQSS/7956 show original file format #12145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
600273f
7956 - display original file when ingested
qqmyers Sep 27, 2023
e6f2f5b
typo
qqmyers Sep 27, 2023
db450ec
fix name, size, update file page and file citation
qqmyers Sep 27, 2023
7fbbfd0
add ': '
qqmyers Sep 27, 2023
b577bfa
Merge remote-tracking branch 'IQSS/develop' into
qqmyers Feb 4, 2026
b88e055
cleanup space changes
qqmyers Feb 10, 2026
d46e5f7
Merge remote-tracking branch 'IQSS/develop' into IQSS/7956-show_origi…
qqmyers Feb 10, 2026
4a01622
typo
qqmyers Feb 11, 2026
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
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/DataCitation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public DataCitation(FileMetadata fm, boolean direct) {
getCommonValuesFrom(dsv);

// file Title for direct File citation
fileTitle = fm.getLabel();
fileTitle = fm.getLabelForOriginal();
DataFile df = fm.getDataFile();

// File description
Expand Down
15 changes: 12 additions & 3 deletions src/main/java/edu/harvard/iq/dataverse/DataFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ public Long getOriginalFileSize() {
return null;
}

public String getFriendlyOriginalFileSize() {
Long size = (getOriginalFileSize()==null) ? filesize : getOriginalFileSize();
return getFriendlySize(size);
}

public String getOriginalFileName() {
if (isTabularData()) {
DataTable dataTable = getDataTable();
Expand All @@ -518,7 +523,7 @@ public String getOriginalFileName() {
}


private String getDerivedOriginalFileName() {
public String getDerivedOriginalFileName() {
FileMetadata fm = getFileMetadata();
String filename = fm.getLabel();
String originalExtension = FileUtil.generateOriginalExtension(getOriginalFileFormat());
Expand Down Expand Up @@ -668,8 +673,12 @@ public void setFilesize(long filesize) {
* @return
*/
public String getFriendlySize() {
if (filesize != null) {
return FileSizeChecker.bytesToHumanReadable(filesize);
return getFriendlySize(filesize);
}

private String getFriendlySize(Long size) {
if (size != null) {
return FileSizeChecker.bytesToHumanReadable(size);
} else {
return BundleUtil.getStringFromBundle("file.sizeNotAvailable");
}
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,14 @@ public void setLabel(String label) {
this.label = label;
}

public String getLabelForOriginal() {
if(dataFile.isTabularData()) {
return dataFile.getDerivedOriginalFileName();
} else {
return label;
}
}

public FileMetadata() {
variableMetadatas = new ArrayList<VariableMetadata>();
varGroups = new ArrayList<VarGroup>();
Expand Down
13 changes: 7 additions & 6 deletions src/main/webapp/file-info-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,19 @@
<ui:fragment rendered="#{!editDatafilesPage}">
<!-- conditional render in file page links, if file has global id, use that; if not, we use database id -->
<a href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(fileIdParam).concat(fileIdValue).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}">
#{fileMetadata.label}
#{fileMetadata.labelForOriginal}
</a>
</ui:fragment>
<ui:fragment rendered="#{editDatafilesPage}">
<span>#{fileMetadata.label}</span>
<span>#{fileMetadata.labelForOriginal}</span>
</ui:fragment>
</div>
<!-- HIERARCHY + TYPE + SIZE + DATE + CHECKSUM -->
<div class="text-muted small">
<!-- id:#{dataFile.id} -->
<!-- id:#{fileMetadata.dataFile.id} -->
<h:outputText id="fileHierarchy" styleClass="show" value="#{fileMetadata.directoryLabel}/" rendered="#{hasDirectoryLabel}"/>
<h:outputText id="fileType" value="#{dataFile.tabularData ? bundle['file.type.tabularData'] : dataFile.friendlyType}"/>
<h:outputText id="fileSize" value=" - #{dataFile.friendlySize}"/>
<h:outputText id="fileType" value="#{dataFile.friendlyType}"/>
<h:outputText id="fileSize" value=" - #{dataFile.friendlyOriginalFileSize}"/>
<div class="dateCreatePublish-block">
<h:outputText id="fileCreatePublishDate" value="#{isReleased ? ((dataFile.embargo!=null) ? bundle['metadatareleased'] : bundle['published']) : bundle['deposited']} #{fileMetadata.getFileDateToDisplay()}" rendered="#{hasFileId}"/>
<h:outputText id="embargoDate" class="embargoright" value="#{isReleased ? ((dataFileServiceBean.isActivelyEmbargoed(fileMetadata)) ? bundle['embargoed.until'] : bundle['embargoed.wasthrough']):bundle['embargoed.willbeuntil']} #{dataFile.embargo.formattedDateAvailable}" rendered="#{hasEmbargo}"/>
Expand All @@ -91,7 +91,7 @@
</h:outputFormat>
</div>
<!-- CHECKSUM -->
<div class="checksum-block" jsf:rendered="#{!dataFile.tabularData and !(empty dataFile.checksumValue)}">
<div class="checksum-block" jsf:rendered="#{!(empty dataFile.checksumValue)}">
<span class="#{!editDatafilesPage ? 'checksum-truncate checksum-tooltip' : ''}" style="margin-right:3px;"
data-toggle="tooltip" data-placement="top" data-html="true"
data-clipboard-action="copy"
Expand All @@ -105,6 +105,7 @@
</div>
<!-- TABULAR VARIABLES, OBSERVATIONS + UNF -->
<div class="unf-block" jsf:rendered="#{isTabularData}">
<h:outputText value="#{bundle['file.type.tabularData']}: "/>
<h:outputText id="fileNumVars" value="#{dataFile.dataTable.varQuantity} #{bundle['file.metaData.dataFile.dataTab.variables']}, "/>
<h:outputText id="fileNumObs" value="#{dataFile.dataTable.caseQuantity} #{bundle['file.metaData.dataFile.dataTab.observations']} "/>
<span jsf:id="fileUNF" class="#{!editDatafilesPage ? 'checksum-truncate checksum-tooltip' : ''}" style="margin-right:3px;"
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/file.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="col-xs-12">
<div class="row">
<div id="file-title-block" class="col-xs-12 margin-bottom-half">
<span class="file-title-label">#{FilePage.fileMetadata.label}</span>
<span class="file-title-label">#{FilePage.fileMetadata.labelForOriginal}</span>

<!-- FILE LEVEL MSGs -->
<div class="bg-info text-info text-center margin-bottom-half" jsf:rendered="#{FilePage.fileMetadata.dataFile.ingestProblem and FilePage.canUpdateDataset()}">
Expand Down Expand Up @@ -590,11 +590,11 @@
<td>#{FilePage.file.retention.reason}
</td>
</tr>
<tr id="fileSizeBlock" jsf:rendered="#{!(empty FilePage.file.friendlySize)}">
<tr id="fileSizeBlock" jsf:rendered="#{!(empty FilePage.file.friendlyOriginalFileSize)}">
<th scope="row">
#{bundle['file.metadataTab.fileMetadata.size.label']}
</th>
<td>#{FilePage.file.friendlySize}</td>
<td>#{FilePage.file.friendlyOriginalFileSize}</td>
</tr>
<tr id="fileTypeBlock" jsf:rendered="#{!(empty FilePage.file.friendlyType)}">
<th scope="row">
Expand Down