importConstants

MPDL · Jul 25, 2024 · 82bc828 · 82bc828
1 parent d5f1385
commit 82bc828
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/ImageThumbConverter.java
@@ -59,14 +59,14 @@
  * @author Leonid Andreev
  */
 public class ImageThumbConverter {
-    public static String THUMBNAIL_SUFFIX = "thumb";
-    public static String THUMBNAIL_MIME_TYPE = "image/png";
-    public static String THUMBNAIL_FILE_EXTENSION = ".png";
-
-    public static int DEFAULT_CARDIMAGE_SIZE = 48;
-    public static int DEFAULT_THUMBNAIL_SIZE = 64;
-    public static int DEFAULT_DATASETLOGO_SIZE = 140;
-    public static int DEFAULT_PREVIEW_SIZE = 400;
+    public static final String THUMBNAIL_SUFFIX = "thumb";
+    public static final String THUMBNAIL_MIME_TYPE = "image/png";
+    public static final String THUMBNAIL_FILE_EXTENSION = ".png";
+
+    public static final int DEFAULT_CARDIMAGE_SIZE = 48;
+    public static final int DEFAULT_THUMBNAIL_SIZE = 64;
+    public static final int DEFAULT_DATASETLOGO_SIZE = 140;
+    public static final int DEFAULT_PREVIEW_SIZE = 400;
 
     private static final Logger logger = Logger.getLogger(ImageThumbConverter.class.getCanonicalName());
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java b/src/main/java/edu/harvard/iq/dataverse/dataset/DatasetUtil.java
@@ -121,6 +121,11 @@ public static DatasetThumbnail getThumbnail(Dataset dataset, DatasetVersion data
             return null;
         }
 
+        if (size == 0) {
+            //Size 0 will fail (and set the failure flag) and should never be sent
+            logger.warning("getThumbnail called with size 0");
+            return null;
+        }
         StorageIO<Dataset> dataAccess = null;
 
         try{

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -83,6 +83,7 @@
             </ui:define>
             <ui:define name="og_header">
                 <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
+                    <o:importConstants type="edu.harvard.iq.dataverse.dataaccess.ImageThumbConverter" />
                     <meta property="og:title" content="#{DatasetPage.title}" />
                     <meta property="og:type" content="article" />
                     <meta property="og:url" content="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" />