[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERAttachment/Sources/er/attachment/processors ERAttachmentProcessor.java, 1.10, 1.11

[Mike S. <ms...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERAttachment/Sources/er/attachment/processors
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12157/Sources/er/attachment/processors

Modified Files:
	ERAttachmentProcessor.java 
Log Message:
Added ERPendingAttachment -- a useful "pre-EC" wrapper object to hold information about an uploaded attachment

Index: ERAttachmentProcessor.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERAttachment/Sources/er/attachment/processors/ERAttachmentProcessor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ERAttachmentProcessor.java	14 Aug 2007 03:13:31 -0000	1.10
--- ERAttachmentProcessor.java	14 Aug 2007 17:58:31 -0000	1.11
***************
*** 16,19 ****
--- 16,20 ----
  import er.attachment.model.ERDatabaseAttachment;
  import er.attachment.model.ERFileAttachment;
+ import er.attachment.model.ERPendingAttachment;
  import er.attachment.model.ERS3Attachment;
  import er.attachment.utils.ERMimeType;
***************
*** 181,185 ****
     */
    public T process(EOEditingContext editingContext, File uploadedFile, String recommendedFilePath) throws IOException {
!     return process(editingContext, uploadedFile, recommendedFilePath, null, null, null);
    }
  
--- 182,186 ----
     */
    public T process(EOEditingContext editingContext, File uploadedFile, String recommendedFilePath) throws IOException {
!     return process(editingContext, new ERPendingAttachment(uploadedFile, recommendedFilePath, null, null, null));
    }
  
***************
*** 196,200 ****
     */
    public T process(EOEditingContext editingContext, File uploadedFile, String recommendedFilePath, String mimeType) throws IOException {
!     return process(editingContext, uploadedFile, recommendedFilePath, mimeType, null, null);
    }
  
--- 197,201 ----
     */
    public T process(EOEditingContext editingContext, File uploadedFile, String recommendedFilePath, String mimeType) throws IOException {
!     return process(editingContext, new ERPendingAttachment(uploadedFile, recommendedFilePath, mimeType, null, null));
    }
  
***************
*** 213,218 ****
     */
    public T process(EOEditingContext editingContext, File uploadedFile, String recommendedFilePath, String mimeType, String configurationName, String ownerID) throws IOException {
!     String recommendedFileName = ERXFileUtilities.fileNameFromBrowserSubmittedPath(recommendedFilePath);
! 
      long maxSize = ERXProperties.longForKey("er.attachment." + configurationName + ".maxSize");
      if (maxSize == 0) {
--- 214,233 ----
     */
    public T process(EOEditingContext editingContext, File uploadedFile, String recommendedFilePath, String mimeType, String configurationName, String ownerID) throws IOException {
!     return process(editingContext, new ERPendingAttachment(uploadedFile, recommendedFilePath, mimeType, configurationName, ownerID));
!   }
!   /**
!    * Processes an uploaded file, imports it into the appropriate data store, and returns an ERAttachment that
!    * represents it.  uploadedFile will be deleted after the import process is complete.
!    * 
!    * @param editingContext the EOEditingContext to create the ERAttachment in
!    * @param pendingAttachment the ERPendingAttachment that encapsulates the import information
!    * @return an ERAttachment that represents the file
!    * @throws IOException if the processing fails
!    */
!   public T process(EOEditingContext editingContext, ERPendingAttachment pendingAttachment) throws IOException {
!     File uploadedFile = pendingAttachment.uploadedFile();
!     String recommendedFileName = pendingAttachment.recommendedFileName();
!     String configurationName = pendingAttachment.configurationName();
!     
      long maxSize = ERXProperties.longForKey("er.attachment." + configurationName + ".maxSize");
      if (maxSize == 0) {
***************
*** 227,238 ****
      }
  
!     String suggestedMimeType = mimeType;
      if (suggestedMimeType == null) {
!       if (suggestedMimeType == null) {
!         String extension = ERXFileUtilities.fileExtension(recommendedFileName);
!         ERMimeType erMimeType = ERMimeTypeManager.mimeTypeManager().mimeTypeForExtension(extension, false);
!         if (erMimeType != null) {
!           suggestedMimeType = erMimeType.mimeType();
!         }
        }
  
--- 242,258 ----
      }
  
!     String suggestedMimeType = pendingAttachment.mimeType();
!     if (suggestedMimeType != null) {
!       ERMimeType erMimeType = ERMimeTypeManager.mimeTypeManager().mimeTypeForMimeTypeString(suggestedMimeType, false);
!       if (erMimeType == null) {
!         suggestedMimeType = null;
!       }
!     }
!     
      if (suggestedMimeType == null) {
!       String extension = ERXFileUtilities.fileExtension(recommendedFileName);
!       ERMimeType erMimeType = ERMimeTypeManager.mimeTypeManager().mimeTypeForExtension(extension, false);
!       if (erMimeType != null) {
!         suggestedMimeType = erMimeType.mimeType();
        }
  
***************
*** 242,245 ****
--- 262,266 ----
      }
  
+     String ownerID = pendingAttachment.ownerID();
      T attachment = _process(editingContext, uploadedFile, recommendedFileName, suggestedMimeType, configurationName, ownerID);
      attachment.setConfigurationName(configurationName);