litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1096 Look for MIME-types that are specific to Internet Explorer, and translate them to recognized values.

Browse source
This commit is contained in:
jeb228 2010-08-23 16:45:22 +00:00
parent 7a2c5691cf
commit 393256b03d
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
View file

@ -68,6 +68,9 @@ public class ImageUploadHelper {
/** Recognized file extensions mapped to MIME-types. */ /** Recognized file extensions mapped to MIME-types. */
private static final Map<String, String> RECOGNIZED_FILE_TYPES = createFileTypesMap(); private static final Map<String, String> RECOGNIZED_FILE_TYPES = createFileTypesMap();
/** Browser-specific MIME-types mapped to recognized MIME-types. */
private static final Map<String, String> NON_STANDARD_MIME_TYPES = createNonStandardMimeTypesMap();
private static Map<String, String> createFileTypesMap() { private static Map<String, String> createFileTypesMap() {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
map.put(".gif", "image/gif"); map.put(".gif", "image/gif");
@ -78,6 +81,18 @@ public class ImageUploadHelper {
return Collections.unmodifiableMap(map); return Collections.unmodifiableMap(map);
} }
/**
* Internet Explorer can tell us that an image has a funky
* Microsoft-specific MIME-type, and we can replace it with one that
* everyone recognizes. This table records those types.
*/
private static Map<String, String> createNonStandardMimeTypesMap() {
Map<String, String> map = new HashMap<String, String>();
map.put("image/x-png", "image/png");
map.put("image/pjpeg", "image/jpeg");
return Collections.unmodifiableMap(map);
}
/* /*
* Prevent Java Advanced Imaging from complaining about the lack of * Prevent Java Advanced Imaging from complaining about the lack of
* accelerator classes. * accelerator classes.
@ -140,6 +155,7 @@ public class ImageUploadHelper {
String filename = getSimpleFilename(file); String filename = getSimpleFilename(file);
String mimeType = getMimeType(file); String mimeType = getMimeType(file);
if (!RECOGNIZED_FILE_TYPES.containsValue(mimeType)) { if (!RECOGNIZED_FILE_TYPES.containsValue(mimeType)) {
log.debug("Unrecognized MIME type: '" + mimeType + "'");
throw new UserMistakeException("'" + filename throw new UserMistakeException("'" + filename
+ "' is not a recognized image file type. " + "' is not a recognized image file type. "
+ "Please upload JPEG, GIF, or PNG files only."); + "Please upload JPEG, GIF, or PNG files only.");
@ -337,6 +353,11 @@ public class ImageUploadHelper {
private String getMimeType(FileItem file) { private String getMimeType(FileItem file) {
String mimeType = file.getContentType(); String mimeType = file.getContentType();
if (mimeType != null) { if (mimeType != null) {
// If the browser supplied the MIME type, we may need to
// replace it with the standard value.
if (NON_STANDARD_MIME_TYPES.containsKey(mimeType)) {
mimeType = NON_STANDARD_MIME_TYPES.get(mimeType);
}
return mimeType; return mimeType;
} }