Skip to content

Commit

Permalink
rename previewshavefailed to previewimagefail IQSS#9506
Browse files Browse the repository at this point in the history
This matches previewimageavailable, also in dvobject.

Plus it's clear we aren't talking about shaving. :)
  • Loading branch information
pdurbin committed Nov 30, 2023
1 parent d647f81 commit 4ad06ba
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ public boolean isThumbnailAvailable (DataFile file) {
this.save(file);
return true;
}
file.setPreviewsHaveFailed(true);
file.setPreviewImageFail(true);
this.save(file);
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ public Long getThumbnailByVersionId(Long versionId) {
+ "AND df.id = o.id "
+ "AND fm.datasetversion_id = dv.id "
+ "AND fm.datafile_id = df.id "
+ "AND o.previewshavefailed = false "
+ "AND o.previewimagefail = false "
+ "AND df.restricted = false "
+ "AND df.embargo_id is null "
+ "AND df.contenttype LIKE 'image/%' "
Expand Down Expand Up @@ -859,7 +859,7 @@ public Long getThumbnailByVersionId(Long versionId) {
+ "AND df.id = o.id "
+ "AND fm.datasetversion_id = dv.id "
+ "AND fm.datafile_id = df.id "
+ "AND o.previewshavefailed = false "
+ "AND o.previewimagefail = false "
+ "AND df.restricted = false "
+ "AND df.embargo_id is null "
+ "AND df.contenttype = 'application/pdf' "
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/edu/harvard/iq/dataverse/DvObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,14 @@ public void setPreviewImageAvailable(boolean status) {
* real failure in generating the thumbnail. In both cases, we won't want to try
* again every time the preview/thumbnail is requested for a view.
*/
private boolean previewsHaveFailed;
private boolean previewImageFail;

public boolean isPreviewsHaveFailed() {
return previewsHaveFailed;
public boolean isPreviewImageFail() {
return previewImageFail;
}

public void setPreviewsHaveFailed(boolean previewsHaveFailed) {
this.previewsHaveFailed = previewsHaveFailed;
public void setPreviewImageFail(boolean previewImageFail) {
this.previewImageFail = previewImageFail;
}

public Timestamp getModificationTime() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/harvard/iq/dataverse/api/Admin.java
Original file line number Diff line number Diff line change
Expand Up @@ -2429,7 +2429,7 @@ public Response getSignedUrl(@Context ContainerRequestContext crc, JsonObject ur
@DELETE
@Path("/clearThumbnailFailureFlag")
public Response clearThumbnailFailureFlag() {
em.createNativeQuery("UPDATE dvobject SET previewshavefailed = FALSE").executeUpdate();
em.createNativeQuery("UPDATE dvobject SET previewimagefail = FALSE").executeUpdate();
return ok("Thumnail Failure Flags cleared.");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ private static boolean isThumbnailAvailable(StorageIO<DataFile> storageIO, int s
}

private static boolean generateThumbnail(DataFile file, StorageIO<DataFile> storageIO, int size) {
logger.log(Level.FINE, (file.isPreviewsHaveFailed() ? "Not trying" : "Trying") + " to generate thumbnail, file id: " + file.getId());
logger.log(Level.FINE, (file.isPreviewImageFail() ? "Not trying" : "Trying") + " to generate thumbnail, file id: " + file.getId());
// Don't try to generate if there have been failures:
if (!file.isPreviewsHaveFailed()) {
if (!file.isPreviewImageFail()) {
boolean thumbnailGenerated = false;
if (file.getContentType().substring(0, 6).equalsIgnoreCase("image/")) {
thumbnailGenerated = generateImageThumbnail(storageIO, size);
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ALTER TABLE dvobject ADD COLUMN IF NOT EXISTS previewshavefailed BOOLEAN DEFAULT FALSE;
ALTER TABLE dvobject ADD COLUMN IF NOT EXISTS previewimagefail BOOLEAN DEFAULT FALSE;

0 comments on commit 4ad06ba

Please sign in to comment.