Changeset 566:5f3c70de152c

Timestamp:

09/29/09 16:08:25 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@567

Message:

refactored with new OutputModule? class
+ implemented multipart messages

Files:

• src/org/w3c/unicorn/output/MailOutputModule.java (modified) (9 diffs)

src/org/w3c/unicorn/output/MailOutputModule.java

@@ -1 @@
-// $Id: MailOutputModule.java,v 1.10 2009-09-28 16:41:18 tgambet Exp $
+// $Id: MailOutputModule.java,v 1.11 2009-09-29 16:08:25 tgambet Exp $
 // Author: Thomas Gambet
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
@@ -9 +9 @@
 import java.io.Writer;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.ArrayList;
 import java.util.Properties;
 import org.w3c.unicorn.util.Message;
+
 import javax.mail.*;
 import javax.mail.internet.*;
@@ -19 +21 @@
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.UnicornAuthenticator;
+
+import javax.mail.internet.MimeBodyPart;
 
 /**
@@ -27 +31 @@
 public class MailOutputModule extends OutputModule {
         
-        private OutputFormater firstOutputFormater;
-        
-        private OutputFormater mailOutputFormater;
-        
-        private String mimeType;
+private List<OutputFormater> mailOutputFormaters;
         
         private String recipient;
+        
+        private String mailFormat;
         
         public MailOutputModule(Map<String, String> mapOfOutputParameters, Map<String, String> mapOfSpecificParameters) {
                 super(mapOfOutputParameters, mapOfSpecificParameters);
                 
-                recipient = mapOfSpecificParameters.get("email");
-                mimeType = mapOfOutputParameters.get("mimetype");
+                recipient = specificParameters.get("email");
                 
-                String format = mapOfOutputParameters.get("format");
-                String lang = mapOfOutputParameters.get("lang"); 
+                mailFormat = specificParameters.get("format");
                 
-                firstOutputFormater = OutputFactory.createOutputFormater(format, lang, mimeType);
+                mailOutputFormaters = new ArrayList<OutputFormater>(); 
+                        
+                mailOutputFormaters.add(OutputFactory.createOutputFormater("text", outputParameters.get("lang")));
                 
-                if (mapOfSpecificParameters.get("format") != null)
-                        format = mapOfSpecificParameters.get("format");
-                if (mapOfSpecificParameters.get("mimetype") != null)
-                        mimeType = mapOfSpecificParameters.get("mimetype");
+                if (mailFormat == null) {
+                        mailFormat = defaultOutputFormater.getFormat();
+                }
                 
-                mailOutputFormater = OutputFactory.createOutputFormater(format, lang, mimeType);
+                if (!"text".equals(mailFormat)) {
+                        mailOutputFormaters.add(OutputFactory.createOutputFormater(mailFormat, outputParameters.get("lang")));
+                }
+                
         }
         
@@ -66 +70 @@
                         messages.add(pendingMess);
                 }
+                if (mailOutputFormaters == null && mailOutputFormaters.get(0) == null)
+                        throw new UnicornException();
+                
                 displayOnIndex(mapOfStringObject, aWriter);
                 messages.remove(pendingMess);
@@ -73 +80 @@
         public void produceOutput(Map<String, Object> mapOfStringObject, final Writer aWriter) {
                 
+                if (recipient == null)
+                        return;
+                if (mailOutputFormaters == null && mailOutputFormaters.get(0) == null)
+                        return;
                 
                 // TODO http://java.sun.com/developer/EJTechTips/2004/tt0625.html#1 for multipart messages
                 
-                
-                if (recipient == null)
-                        return;
-                
-                ArrayList<Message> messages = ((ArrayList<Message>) mapOfStringObject.get("messages"));
-                messages.add(new Message(Message.Level.INFO, "Observation effectuée le " + new Date()));
+
                 
                 try {
+                        ArrayList<Message> messages = ((ArrayList<Message>) mapOfStringObject.get("messages"));
+                        messages.add(new Message(Message.Level.INFO, "Observation effectuée le " + new Date()));
+                        
                         mapOfStringObject.put("baseUri", "http://qa-dev.w3.org:8001/unicorn/");
                         
@@ -95 +104 @@
                         
                         session.setDebug(debug);
-                        javax.mail.Message msg = new MimeMessage(session);
-                    
-                    InternetAddress addressFrom = new InternetAddress(mailProps.getProperty("unicorn.mail.from"), "Unicorn");
-                        msg.setFrom(addressFrom);
-                        msg.setRecipient(javax.mail.Message.RecipientType.TO, new InternetAddress(recipient));
                         
-                        // Setting the Subject and Content Type
                         UnicornCall uniCall = (UnicornCall) mapOfStringObject.get("unicorncall");
                         boolean passed = uniCall.isPassed();
@@ -112 +115 @@
                         subject += "Task \"" + uniCall.getTask().getLongName(outputParameters.get("lang")) + "\" for \"" + uniCall.getDocumentName() + "\"";
                         
+                        javax.mail.Message msg = new MimeMessage(session);
+                    InternetAddress addressFrom = new InternetAddress(mailProps.getProperty("unicorn.mail.from"), "Unicorn");
+                        msg.setFrom(addressFrom);
+                        msg.setRecipient(javax.mail.Message.RecipientType.TO, new InternetAddress(recipient));
                         msg.setSubject(subject);
                         
-                        CharArrayWriter writer = new CharArrayWriter();
-                        mailOutputFormater.produceOutput(mapOfStringObject, writer);
-                        writer.close();
-                        msg.setContent(writer.toString(), mimeType);
+                        if (mailOutputFormaters.size() > 1) {
+                                // New multipart message
+                                Multipart mp = new MimeMultipart("alternative");
+                                for (OutputFormater outputFormater : mailOutputFormaters) {
+                                        MimeBodyPart bodyPart = new MimeBodyPart();
+                                        bodyPart.addHeader("Content-Type", outputFormater.getMimeType() + ", charset=UTF-8");
+                                        CharArrayWriter writer = new CharArrayWriter();
+                                        outputFormater.produceOutput(mapOfStringObject, writer);
+                                        writer.close();
+                                        bodyPart.setContent(writer.toString(), outputFormater.getMimeType());
+                                        mp.addBodyPart(bodyPart);
+                                }
+                                msg.setContent(mp);
+                        } else {
+                                CharArrayWriter writer = new CharArrayWriter();
+                                mailOutputFormaters.get(0).produceOutput(mapOfStringObject, writer);
+                                writer.close();
+                                msg.setContent(writer.toString(), mailOutputFormaters.get(0).getMimeType());
+                        }
                         
                         Transport.send(msg);
+                        
                 } catch (AddressException e) {
                         // TODO Auto-generated catch block
@@ -133 +156 @@
 
         public void produceError(Map<String, Object> mapOfStringObject, final Writer aWriter) {
-                if (outputParameters.get("mimetype").equals("text/html")) {
+                if (getMimeType().equals("text/html")) {
                         displayOnIndex(mapOfStringObject, aWriter);
                         return;
                 }
-                firstOutputFormater.produceError(mapOfStringObject, aWriter);
+                defaultOutputFormater.produceError(mapOfStringObject, aWriter);
         }