From 1b27ec324fa45968e329b6ae39411b7d9f58b064 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 11 Jan 2021 15:08:28 -0500
Subject: [PATCH] Separate unf display from variables + observations on
 dataverse pg result cards [ref #5210 #6685]

---
 .../search/SearchIncludeFragment.java         | 27 ++++++++++++++-----
 src/main/webapp/search-include-fragment.xhtml | 12 ++++++---
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
index 61859700077..73aacbdce2d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -1201,7 +1201,7 @@ public SearchException getSearchException() {
     }
 
     public String tabularDataDisplayInfo(DataFile datafile) {
-        String ret = "";
+        String tabInfo = "";
 
         if (datafile == null) {
             return null;
@@ -1209,22 +1209,35 @@ public String tabularDataDisplayInfo(DataFile datafile) {
 
         if (datafile.isTabularData() && datafile.getDataTable() != null) {
             DataTable datatable = datafile.getDataTable();
-            String unf = datatable.getUnf();
             Long varNumber = datatable.getVarQuantity();
             Long obsNumber = datatable.getCaseQuantity();
             if (varNumber != null && varNumber.intValue() != 0) {
-                ret = ret.concat(varNumber + " " + BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.variables"));
+                tabInfo = tabInfo.concat(varNumber + " " + BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.variables"));
                 if (obsNumber != null && obsNumber.intValue() != 0) {
-                    ret = ret.concat(", " + obsNumber + " " + BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.observations"));
+                    tabInfo = tabInfo.concat(", " + obsNumber + " " + BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.observations"));
                 }
-                ret = ret.concat(" - ");
             }
+        }
+
+        return tabInfo;
+    }
+    
+    public String tabularDataUnfDisplay(DataFile datafile) {
+        String tabUnf = "";
+
+        if (datafile == null) {
+            return null;
+        }
+
+        if (datafile.isTabularData() && datafile.getDataTable() != null) {
+            DataTable datatable = datafile.getDataTable();
+            String unf = datatable.getUnf();
             if (unf != null && !unf.equals("")) {
-                ret = ret.concat(BundleUtil.getStringFromBundle("file.metaData.dataFile.dataTab.unf") + ": " + unf);
+                tabUnf = tabUnf.concat(unf);
             }
         }
 
-        return ret;
+        return tabUnf;
     }
 
     public String dataFileSizeDisplay(DataFile datafile) {
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index 956e57242af..d233ee59078 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -619,9 +619,15 @@
                                           title="#{bundle['file.metaData.checksum.copy']} #{result.fileChecksumValue}"
                                           jsf:rendered="#{!result.harvested and !SearchIncludeFragment.isTabular(result.entity) and !(empty result.fileChecksumValue)}">#{result.fileChecksumValue}</span>
 
-                            <!-- if this is a tabular data file, extra information, such as the numbers of variables and observations and the unf, is displayed: -->
-                            <h:outputText value=" - #{SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"
-                                            rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                            <!-- if tabular data file, display number of variables and observations, and unf -->
+                            <h:outputText value=" - " rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                            <h:outputText value="#{SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}" rendered="#{!empty SearchIncludeFragment.tabularDataDisplayInfo(result.entity)}"/>
+                            <h:outputText value=" - " rendered="#{!empty SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"/>
+                            <span class="checksum-truncate" 
+                                          data-clipboard-action="copy"
+                                          data-clipboard-text="#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"
+                                          title="#{bundle['file.metaData.checksum.copy']} #{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}"
+                                          jsf:rendered="#{!empty SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}">#{SearchIncludeFragment.tabularDataUnfDisplay(result.entity)}</span>
                         </div>
 
                         <div class="file-tags-block" jsf:rendered="#{(!empty result.fileCategories) or (!empty result.tabularDataTags)}">