W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2009

2006/unicorn/src/org/w3c/unicorn/output MailOutputModule.java,1.8,1.9

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 24 Sep 2009 17:42:24 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MqsKm-0007Wo-3G@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/output
In directory hutz:/tmp/cvs-serv28922/src/org/w3c/unicorn/output

Modified Files:
	MailOutputModule.java 
Log Message:
an error is thrown if the recipient is not specified
+ adds a temporary message containing the date of the observation to the mail output

Index: MailOutputModule.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/output/MailOutputModule.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MailOutputModule.java	24 Sep 2009 15:33:03 -0000	1.8
+++ MailOutputModule.java	24 Sep 2009 17:42:22 -0000	1.9
@@ -1,24 +1,26 @@
 // $Id$
-// Author: Damien LEROY.
-// (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
+// Author: Thomas Gambet
+// (c) COPYRIGHT MIT, ERCIM and Keio, 2009.
 // Please first read the full copyright statement in file COPYRIGHT.html
 package org.w3c.unicorn.output;
 
 import java.io.CharArrayWriter;
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.util.Date;
 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.*;
 import org.w3c.unicorn.UnicornCall;
+import org.w3c.unicorn.exceptions.UnicornException;
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.UnicornAuthenticator;
 
 /**
- * This module allow to generate output in mail format.
+ * This module allows to send the response by mail.
  * 
  * @author Thomas GAMBET
  */
@@ -49,17 +51,32 @@
 		mailOutputFormater = OutputFactory.createOutputFormater(format, lang, mimeType);
 	}
 	
-	public void produceFirstOutput(Map<String, Object> mapOfStringObject, Writer aWriter) {
+	@SuppressWarnings("unchecked")
+	public void produceFirstOutput(Map<String, Object> mapOfStringObject, Writer aWriter) throws UnicornException {
 		//mapOfStringObject.put("baseUri", "http://qa-dev.w3.org/unicorn/");
 		
-		((ArrayList<org.w3c.unicorn.util.Message>) mapOfStringObject.get("messages")). add(new org.w3c.unicorn.util.Message(org.w3c.unicorn.util.Message.Level.INFO, "Le rapport est en cours d'envoi à l'adresse: " + recipient));
+		ArrayList<Message> messages = ((ArrayList<Message>) mapOfStringObject.get("messages"));
+		Message pendingMess = new Message(Message.Level.INFO, "Le rapport est en cours d'envoi à l'adresse: " + recipient);
+		
+		if (recipient == null) {
+			throw new UnicornException(new Message(Message.Level.ERROR, "Aucune adresse email spécifiée. Rajoutez &opt_email=votre.adresse@mail.com à la requête."));
+		} else {
+			messages.add(pendingMess);
+		}
 		displayOnIndex(mapOfStringObject, aWriter);
+		messages.remove(pendingMess);
 	}
 	
+	@SuppressWarnings("unchecked")
 	public void produceOutput(Map<String, Object> mapOfStringObject, final Writer aWriter) {
 		
+		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 {
-			
 			mapOfStringObject.put("baseUri", "http://qa-dev.w3.org:8001/unicorn/");
 			
 			Properties mailProps = Property.getProps("mail.properties");
@@ -71,11 +88,11 @@
 				debug = true;
 			
 			session.setDebug(debug);
-		    Message msg = new MimeMessage(session);
+			javax.mail.Message msg = new MimeMessage(session);
 		    
 		    InternetAddress addressFrom = new InternetAddress(mailProps.getProperty("unicorn.mail.from"), "Unicorn");
 			msg.setFrom(addressFrom);
-			msg.setRecipient(Message.RecipientType.TO, new InternetAddress(recipient));
+			msg.setRecipient(javax.mail.Message.RecipientType.TO, new InternetAddress(recipient));
 			
 			// Setting the Subject and Content Type
 			UnicornCall uniCall = (UnicornCall) mapOfStringObject.get("unicorncall");
@@ -109,6 +126,10 @@
 	}
 
 	public void produceError(Map<String, Object> mapOfStringObject, final Writer aWriter) {
+		if (outputParameters.get("mimetype").equals("text/html")) {
+			displayOnIndex(mapOfStringObject, aWriter);
+			return;
+		}
 		firstOutputFormater.produceError(mapOfStringObject, aWriter);
 	}
 
Received on Thursday, 24 September 2009 17:42:35 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:14 GMT