summaryrefslogtreecommitdiffstats
path: root/idrop-web/grails-app/services
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-08-10 14:46:20 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-08-10 14:46:20 (GMT)
commitfc39aa351cc77d41006140b397bbc2b4027d45b8 (patch)
treee06177a60b5cc9fb43445d23b577afbea4163ee5 /idrop-web/grails-app/services
parentb1f70920bd574f2330b3f1cf790a1e4310d0ba0e (diff)
downloadQCG-Data-fc39aa351cc77d41006140b397bbc2b4027d45b8.zip
QCG-Data-fc39aa351cc77d41006140b397bbc2b4027d45b8.tar.gz
QCG-Data-fc39aa351cc77d41006140b397bbc2b4027d45b8.tar.bz2
[#925] error change export location (ffx on mac)
Diffstat (limited to 'idrop-web/grails-app/services')
-rw-r--r--idrop-web/grails-app/services/org/irods/mydrop/service/ThumbnailGeneratorService.groovy12
1 files changed, 3 insertions, 9 deletions
diff --git a/idrop-web/grails-app/services/org/irods/mydrop/service/ThumbnailGeneratorService.groovy b/idrop-web/grails-app/services/org/irods/mydrop/service/ThumbnailGeneratorService.groovy
index a4294a9..37c19a7 100644
--- a/idrop-web/grails-app/services/org/irods/mydrop/service/ThumbnailGeneratorService.groovy
+++ b/idrop-web/grails-app/services/org/irods/mydrop/service/ThumbnailGeneratorService.groovy
@@ -42,16 +42,10 @@ class ThumbnailGeneratorService {
InputStream thumbnailData = new BufferedInputStream(thumbnailService.retrieveThumbnailByIRODSAbsolutePathViaRule(irodsAbsolutePath))
thumbnailProcessResult = new ThumbnailProcessResult()
thumbnailProcessResult.thumbnailStream = thumbnailData
- } else {
- log.info("using fallback, cacheProp is false")
- log.info "tempdir:${tempDir}"
- File tempThumbnailFile = thumbnailService.createThumbnailLocallyViaJAI(tempDir, irodsAbsolutePath, 300)
- InputStream thumbnailData = new BufferedInputStream(new FileInputStream(tempThumbnailFile))
- thumbnailProcessResult = new ThumbnailProcessResult()
- thumbnailProcessResult.thumbnailStream = thumbnailData
- thumbnailProcessResult.cleanupFile = tempThumbnailFile
+ } else {
+ log.warn("cannot process thumbnail, imagemagik is not supported")
+ return null
}
-
return thumbnailProcessResult
}