From ceb1bb2af931e09c5c5e0257b38c284f2c95158e Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 30 Jun 2010 18:12:49 +0000 Subject: [PATCH] NIHVIVO-161 Remove obsolete files from previous implementation. --- .../edit/ImageUploadController.java | 68 --- .../controller/edit/UploadImagesServlet.java | 481 ------------------ .../edit/specific/uploadimages_body.jsp | 132 ----- .../edit/specific/uploadimages_head.jsp | 31 -- 4 files changed, 712 deletions(-) delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ImageUploadController.java delete mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UploadImagesServlet.java delete mode 100644 webapp/web/templates/edit/specific/uploadimages_body.jsp delete mode 100644 webapp/web/templates/edit/specific/uploadimages_head.jsp diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ImageUploadController.java deleted file mode 100644 index 0b2eacb0c..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ImageUploadController.java +++ /dev/null @@ -1,68 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.controller.edit; - -import java.util.HashMap; - -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vedit.controller.BaseEditController; -import edu.cornell.mannlib.vedit.beans.EditProcessObject; -import edu.cornell.mannlib.vedit.beans.FormObject; - -import edu.cornell.mannlib.vitro.webapp.auth.policy.JenaNetidPolicy.ContextSetup; -import edu.cornell.mannlib.vitro.webapp.controller.Controllers; - -public class ImageUploadController extends BaseEditController { - - private static final Log log = LogFactory.getLog(ImageUploadController.class.getName()); - - public void doGet(HttpServletRequest request, HttpServletResponse response) { - - if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI"))) - return; - - try { - super.doGet(request,response); - } catch (Exception e) { - e.printStackTrace(); - } - - String individualURIStr= - (individualURIStr=(String)request.getAttribute("entityUri"))==null ? - ((individualURIStr=request.getParameter("entityUri"))==null ? null:individualURIStr) : individualURIStr; - - if (individualURIStr != null) - request.setAttribute("individual", getWebappDaoFactory().getIndividualDao().getIndividualByURI(individualURIStr)); - - EditProcessObject epo = super.createEpo(request); - FormObject foo = new FormObject(); - HashMap optionMap = new HashMap(); - foo.setOptionLists(optionMap); - epo.setFormObject(foo); - - RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP); - request.setAttribute("bodyJsp","/templates/edit/specific/uploadimages_body.jsp"); - request.setAttribute("scripts","/templates/edit/specific/uploadimages_head.jsp"); - request.setAttribute("title","Upload Image"); - request.setAttribute("bodyAttr","onLoad=\"initDHTMLAPI();initGroupDisplay('thumbnailExtra','block');\""); - request.setAttribute("epoKey",epo.getKey()); - try { - rd.forward(request, response); - } catch (Exception e) { - log.error("ImageUploadController could not forward to view."); - log.error(e.getMessage()); - log.error(e.getStackTrace()); - } - } - - public void doPost(HttpServletRequest request, HttpServletResponse response) { - doGet(request,response); - } - -} diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UploadImagesServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UploadImagesServlet.java deleted file mode 100644 index a63630ec1..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UploadImagesServlet.java +++ /dev/null @@ -1,481 +0,0 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.controller.edit; - -import java.awt.Graphics2D; -import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.imageio.ImageIO; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.UnavailableException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import edu.cornell.mannlib.vitro.webapp.beans.Individual; -import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.filestorage.FileModelHelper; -import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileAlreadyExistsException; -import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage; -import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup; -import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest; - -public class UploadImagesServlet extends VitroHttpServlet { - private static final Log log = LogFactory.getLog(UploadImagesServlet.class); - - /** Recognized file extensions mapped to MIME-types. */ - private static final Map RECOGNIZED_FILE_TYPES = createFileTypesMap(); - - /** The field in the HTTP request that holds the file. */ - public static final String FILE_FIELD_NAME = "file1"; - - /** The field in the HTTP request that holds the individual's URI. */ - public static final String URI_FIELD_NAME = "entityUri"; - - /** Limit file size to 50 megabytes. */ - private static final int MAXIMUM_FILE_SIZE = 50 * 1024 * 1024; - - /** How wide should a generated thumbnail image be (in pixels)? */ - private static final int THUMBNAIL_WIDTH = 150; - - /** How high should a generated thumbnail image be (in pixels)? */ - private static final int THUMBNAIL_HEIGHT = 150; - - private FileStorage fileStorage; - - private static Map createFileTypesMap() { - Map map = new HashMap(); - map.put(".gif", "image/gif"); - map.put(".png", "image/png"); - map.put(".jpg", "image/jpeg"); - map.put(".jpeg", "image/jpeg"); - map.put(".jpe", "image/jpeg"); - return Collections.unmodifiableMap(map); - } - - /** - * On startup, get a reference to the {@link FileStorage} system from the - * {@link ServletContext}. - * - * @throws UnavailableException - * if the attribute is missing, or is not of the correct type. - */ - @Override - public void init() throws ServletException { - Object o = getServletContext().getAttribute( - FileStorageSetup.ATTRIBUTE_NAME); - if (o instanceof FileStorage) { - fileStorage = (FileStorage) o; - } else if (o == null) { - throw new UnavailableException(this.getClass().getSimpleName() - + " could not initialize. Attribute '" - + FileStorageSetup.ATTRIBUTE_NAME - + "' was not set in the servlet context."); - } else { - throw new UnavailableException(this.getClass().getSimpleName() - + " could not initialize. Attribute '" - + FileStorageSetup.ATTRIBUTE_NAME - + "' in the servlet context contained an instance of '" - + o.getClass().getName() + "' instead of '" - + FileStorage.class.getName() + "'"); - } - } - - /** - * Treat a GET request like a POST request. However, since a GET request - * cannot contain uploaded files, this should produce an error. - */ - @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - doPost(request, response); - } - - /** - *

- * Store an image file as the main image for the associated individual. The - * request must be a multi-part request containing the file. It must also - * contain a parameter for the URI of the individual. - *

- *

- * If the individual already has a main image, it will be removed. The new - * image is stored, and a thumbnail is generated and stored. - *

- */ - @Override - protected void doPost(HttpServletRequest rawRequest, - HttpServletResponse response) throws ServletException, IOException { - List errors = new ArrayList(); - - try { - VitroRequest request = new VitroRequest(FileUploadServletRequest - .parseRequest(rawRequest, MAXIMUM_FILE_SIZE)); - try { - FileItem imageFileItem = validateImageFromRequest(request); - Individual person = validateEntityUriFromRequest(request); - - FileModelHelper fileModelHelper = new FileModelHelper( - getWebappDaoFactory()); - - removeExistingImage(person, fileModelHelper); - storeMainImageFile(person, imageFileItem, fileModelHelper); - generateThumbnailAndStore(person, imageFileItem, - fileModelHelper); - - displaySuccess(request, response, person); - } catch (UserErrorException e) { - // No need to log it - it's a user error. - errors.add(e.getMessage()); - displayFailure(request, response, errors); - } catch (IllegalStateException e) { - log.error(e, e); - errors.add(e.getMessage()); - displayFailure(request, response, errors); - } - } catch (FileUploadException e) { - log.error(e, e); - errors.add(e.getMessage()); - displayFailure(rawRequest, response, errors); - } - } - - /** - * The image must be present and non-empty, and must have a mime-type that - * represents an image we support. - * - * We rely on the fact that a {@link FileUploadServletRequest} will always - * have a map of {@link FileItem}s, even if it is empty. However, that map - * may not contain the field that we want, or that field may contain an - * empty file. - * - * @throws UserErrorException - * if there is no file, if it is empty, or if it is not an image - * file. - */ - @SuppressWarnings("unchecked") - private FileItem validateImageFromRequest(HttpServletRequest request) - throws UserErrorException { - Map> map = (Map>) request - .getAttribute(FileUploadServletRequest.FILE_ITEM_MAP); - List list = map.get(FILE_FIELD_NAME); - if ((list == null) || list.isEmpty()) { - throw new UserErrorException("The form did not contain a '" - + FILE_FIELD_NAME + "' field."); - } - - FileItem file = list.get(0); - if (file.getSize() == 0) { - throw new UserErrorException("No file was uploaded in '" - + FILE_FIELD_NAME + "'"); - } - - String filename = getSimpleFilename(file); - String mimeType = getMimeType(file); - if (!RECOGNIZED_FILE_TYPES.containsValue(mimeType)) { - throw new UserErrorException("'" + filename - + "' is not a recognized image file type. " - + "These are the recognized types: " - + RECOGNIZED_FILE_TYPES); - } - - return file; - } - - /** - * The entity URI must be present and non-empty, and must refer to an - * existing individual. - * - * @throws UserErrorException - * if there is no entity URI, or if it is empty. - */ - private Individual validateEntityUriFromRequest(VitroRequest request) - throws UserErrorException { - String entityUri = request.getParameter(URI_FIELD_NAME); - if (entityUri == null) { - throw new UserErrorException("The form did not contain a '" - + URI_FIELD_NAME + "' field."); - } - entityUri = entityUri.trim(); - if (entityUri.length() == 0) { - throw new UserErrorException("The form did not contain a '" - + URI_FIELD_NAME + "' field."); - } - - Individual entity = request.getWebappDaoFactory().getIndividualDao() - .getIndividualByURI(entityUri); - if (entity == null) { - throw new UserErrorException( - "No entity exists with the provided URI: '" + entityUri - + "'"); - } - return entity; - } - - /** - * If this entity already had a main image, remove the connection. If the - * image and the thumbnail are no longer used by anyone, remove them from - * the model, and from the file system. - */ - private void removeExistingImage(Individual person, - FileModelHelper fileModelHelper) { - Individual mainImage = fileModelHelper.removeMainImage(person); - if (mainImage == null) { - return; - } - - Individual thumbnail = FileModelHelper.getThumbnailForImage(mainImage); - - if (!fileModelHelper.isFileReferenced(mainImage)) { - Individual bytes = FileModelHelper.getBytestreamForFile(mainImage); - if (bytes != null) { - try { - fileStorage.deleteFile(bytes.getURI()); - } catch (IOException e) { - throw new IllegalStateException( - "Can't delete the main image file: '" - + bytes.getURI() + "'", e); - } - } - fileModelHelper.removeFileFromModel(mainImage); - } - if (!fileModelHelper.isFileReferenced(thumbnail)) { - Individual bytes = FileModelHelper.getBytestreamForFile(thumbnail); - if (bytes != null) { - try { - fileStorage.deleteFile(bytes.getURI()); - } catch (IOException e) { - throw new IllegalStateException( - "Can't delete the thumbnail file: '" - + bytes.getURI() + "'", e); - } - } - fileModelHelper.removeFileFromModel(thumbnail); - } - } - - /** - * Store this image in the model and in the file storage system, and set it - * as the main image for this person. - */ - private void storeMainImageFile(Individual person, FileItem imageFileItem, - FileModelHelper fileModelHelper) { - InputStream inputStream = null; - try { - inputStream = imageFileItem.getInputStream(); - String mimeType = getMimeType(imageFileItem); - String filename = getSimpleFilename(imageFileItem); - - // Create the file individuals in the model - Individual byteStream = fileModelHelper - .createByteStreamIndividual(); - Individual file = fileModelHelper.createFileIndividual(mimeType, - filename, byteStream); - - // Store the file in the FileStorage system. - fileStorage.createFile(byteStream.getURI(), filename, inputStream); - - // Set the file as the main image for the person. - fileModelHelper.setAsMainImageOnEntity(person, file); - } catch (FileAlreadyExistsException e) { - throw new IllegalStateException( - "Can't create the main image file: " + e.getMessage(), e); - } catch (IOException e) { - throw new IllegalStateException("Can't create the main image file", - e); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * Generate the thumbnail image from the original, store in the model and in - * the file storage system, and set it as the thumbnail on the main image. - */ - private void generateThumbnailAndStore(Individual person, - FileItem imageFileItem, FileModelHelper fileModelHelper) { - - InputStream inputStream = null; - try { - inputStream = scaleImageForThumbnail( - imageFileItem.getInputStream(), THUMBNAIL_WIDTH, - THUMBNAIL_HEIGHT); - String mimeType = RECOGNIZED_FILE_TYPES.get(".jpg"); - String filename = createThumbnailFilename(getSimpleFilename(imageFileItem)); - - // Create the file individuals in the model - Individual byteStream = fileModelHelper - .createByteStreamIndividual(); - Individual file = fileModelHelper.createFileIndividual(mimeType, - filename, byteStream); - - // Store the file in the FileStorage system. - fileStorage.createFile(byteStream.getURI(), filename, inputStream); - - // Set the file as the thumbnail on the main image for the person. - fileModelHelper.setThumbnailOnIndividual(person, file); - } catch (FileAlreadyExistsException e) { - throw new IllegalStateException("Can't create the thumbnail file: " - + e.getMessage(), e); - } catch (IOException e) { - throw new IllegalStateException("Can't create the thumbnail file", - e); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - /** - * Everything went fine. Forward back to the JSP. - */ - private void displaySuccess(VitroRequest request, - HttpServletResponse response, Individual person) - throws ServletException, IOException { - try { - request.setAttribute(URI_FIELD_NAME, person.getURI()); - - String individualURI = person.getURI(); - String recordName = person.getName(); - if ((recordName == null) || recordName.isEmpty()) { - recordName = "here"; - } - request.setAttribute("processError", - "updated individual " - + recordName + ""); - request.setAttribute("outputLink", ""); - getServletContext().getRequestDispatcher("/uploadimages.jsp") - .forward(request, response); - } catch (UnsupportedEncodingException e) { - log.error("This can't happen.", e); - } - } - - /** - * Problem! Format the error messages and forward back to the JSP. - */ - private void displayFailure(HttpServletRequest request, - HttpServletResponse response, List errors) - throws ServletException, IOException { - String entityUri = request.getParameter(URI_FIELD_NAME); - request.setAttribute(URI_FIELD_NAME, entityUri); - - StringBuilder formatted = new StringBuilder(); - for (String error : errors) { - if (formatted.length() > 0) { - formatted.append("
"); - } - formatted.append(error); - } - - request.setAttribute("processError", formatted.toString()); - getServletContext().getRequestDispatcher("/uploadimages.jsp").forward( - request, response); - } - - /** - * Internet Explorer and Opera will give you the full path along with the - * filename. This will remove the path. - */ - private String getSimpleFilename(FileItem item) { - String fileName = item.getName(); - if (fileName == null) { - return null; - } else { - return FilenameUtils.getName(fileName); - } - } - - /** - * Get the MIME type as supplied by the browser. If none, try to infer it - * from the filename extension and the map of recognized MIME types. - */ - private String getMimeType(FileItem file) { - String mimeType = file.getContentType(); - if (mimeType != null) { - return mimeType; - } - - String filename = getSimpleFilename(file); - int periodHere = filename.lastIndexOf('.'); - if (periodHere == -1) { - return null; - } - - String extension = filename.substring(periodHere); - return RECOGNIZED_FILE_TYPES.get(extension); - } - - private InputStream scaleImageForThumbnail(InputStream source, int width, - int height) throws IOException { - BufferedImage bsrc = ImageIO.read(source); - - AffineTransform at = AffineTransform.getScaleInstance((double) width - / bsrc.getWidth(), (double) height / bsrc.getHeight()); - - BufferedImage bdest = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - Graphics2D g = bdest.createGraphics(); - - g.drawRenderedImage(bsrc, at); - - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - ImageIO.write(bdest, "JPG", buffer); - return new ByteArrayInputStream(buffer.toByteArray()); - } - - /** - * Create a name for the thumbnail from the name of the original file. - * "myPicture.anything" becomes "thumbnail_myPicture.jpg". - */ - private String createThumbnailFilename(String filename) { - String prefix = "thumbnail_"; - String extension = ".jpg"; - int periodHere = filename.lastIndexOf('.'); - if (periodHere == -1) { - return prefix + filename + extension; - } else { - return prefix + filename.substring(0, periodHere) + extension; - } - } - - /** - * Indicates that we should complain to the user. - */ - private static class UserErrorException extends Exception { - UserErrorException(String message) { - super(message); - } - } -} diff --git a/webapp/web/templates/edit/specific/uploadimages_body.jsp b/webapp/web/templates/edit/specific/uploadimages_body.jsp deleted file mode 100644 index 95fe8efd9..000000000 --- a/webapp/web/templates/edit/specific/uploadimages_body.jsp +++ /dev/null @@ -1,132 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - - - - - - -
- Results from processing input file:
- ${processError} - -
Link to check uploaded image:
- <${outputLink}> - -

-

- - - -
-

- - -
-
- - - - - - - - - - <%-- RY Disabling large image upload - - - - - - - - --%> - - - - - - - - - - - - - - - - - - - -
- Individual - - - - - - -

No individuals match the incoming parameters or no individual was specified in the request

- - -
- Select Image Type
- 		- thumbnail (150px x 150px only) - optional larger image -
- Select Image File - -
${inputLink} - - 		- Please note: images are displayed at approximately 150x150px. Smaller images may not display optimally.
- -
- Optional remote image link - - -
- Destination Directory
- 		- buildings
- events
- logos
- people
- projects
- science
- other
-
- Select Processing Mode
- 		- upload image - upload and replace any existing image or URL -
- <%-- RY Disabling large image upload --%> -

- - -

-
-
-
-
-
- -
diff --git a/webapp/web/templates/edit/specific/uploadimages_head.jsp b/webapp/web/templates/edit/specific/uploadimages_head.jsp deleted file mode 100644 index 987d33254..000000000 --- a/webapp/web/templates/edit/specific/uploadimages_head.jsp +++ /dev/null @@ -1,31 +0,0 @@ -<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - - -<%-- - ---%> - - - -