From 153ee90add2b7aa7adf73300227d573c547578a1 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 20 Oct 2016 13:37:46 -0400
Subject: [PATCH] Add File Level Citation

---
 .../java/edu/harvard/iq/dataverse/FileMetadata.java | 13 +++++++++++++
 src/main/webapp/file.xhtml                          |  8 +-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
index 18f6356eec8..1ab616915b7 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java
@@ -249,6 +249,19 @@ public String getFileDateToDisplay() {
         }
         return "";
     }
+     
+     public String getFileCitation(){
+         String citation = this.getDatasetVersion().getCitation();
+         /*
+         ", #{FilePage.fileMetadata.label} [fileName]"
+         <h:outputText value=", #{FilePage.file.unf}" rendered="#{FilePage.file.tabularData and !(empty FilePage.file.unf)}"/>
+         */
+         citation += ", " + this.getLabel() + " [fileName]" ;
+         if (this.dataFile.isTabularData() && this.dataFile.getUnf() != null && !this.dataFile.getUnf().isEmpty()){
+             citation += ", " + this.dataFile.getUnf();                    
+         }
+         return citation;
+     }
         
     public DatasetVersion getDatasetVersion() {
         return datasetVersion;
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 912c421f012..ad1e7a77f97 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -182,13 +182,7 @@
                                     <div class="row">
                                         <div id="citation" class="#{DatasetPage.workingVersion.deaccessioned ? 'col-xs-12' : 'col-xs-7 col-md-8'}">
                                             <div id="citation-select" onclick="if (event.target) { selectText(event.target); } else{ selectText(this); }">
-                                                <h:outputText value="#{FilePage.file.owner.citation}" escape="false"/>
-                                                <!-- TODO: ADD THIS SECTION TO THE DYNAMIC CITATION MANAGE BEAN -->
-                                                <!-- TODO: 'fileName' needs to be dynamic {file.name.label} -->
-                                                <h:outputText value=", #{FilePage.fileMetadata.label} [fileName]" />
-
-                                                <h:outputText value=", #{FilePage.file.unf}" rendered="#{FilePage.file.tabularData and !(empty FilePage.file.unf)}"/>
-                                                <!-- END: TODO -->
+                                                <h:outputText value="#{FilePage.fileMetadata.fileCitation}" escape="false"/>
                                             </div>
                                             <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{!FilePage.fileMetadata.datasetVersion.dataset.released}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.released']}"/>
                                             <span class="glyphicon glyphicon-question-sign text-primary" jsf:rendered="#{FilePage.fileMetadata.datasetVersion.dataset.released and FilePage.fileMetadata.datasetVersion.draft}" data-toggle="tooltip" data-trigger="hover" data-placement="top" data-original-title="#{bundle['dataset.cite.title.draft']}"/>