Author: kmorin Date: 2014-06-10 08:49:05 +0200 (Tue, 10 Jun 2014) New Revision: 170 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/170 Log: correction r?\195?\169ception des mails Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-10 06:00:32 UTC (rev 169) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-10 06:49:05 UTC (rev 170) @@ -30,6 +30,7 @@ import java.io.FileOutputStream; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -202,9 +203,9 @@ String recipient = address.toString(); MailFolder mailFolder = serviceContext.newService(MailFolderService.class).getFolderForRecipient(recipient); - log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); + if (mailFolder != null) { + log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); - if (mailFolder != null) { email.setRecipient(recipient); email.setMailFolder(mailFolder); modifiedProperties.add(Email.PROPERTY_RECIPIENT); @@ -213,7 +214,7 @@ } } if (email.getMailFolder() == null) { - break; + continue; } emailService.saveEmail(email, null); @@ -225,10 +226,20 @@ Client client = serviceContext.newService(ClientService.class) .getClientForEmailAddress(sender, email.getMailFolder()); - //TODO kmorin 20140602 find the responsible's folder -// if (client != null) { + + if (client != null) { + String object = client.getCaracteristic1() + " / " + + client.getCode() + " / " + + client.getName() + " / " + + client.getFaxNumber() + " / " + + DateFormat.getDateInstance(DateFormat.MEDIUM).format(new Date()); + email.setObject(object); + modifiedProperties.add(Email.PROPERTY_OBJECT); + modifiedProperties.add(Email.PROPERTY_CLIENT); + + //TODO kmorin 20140602 find the responsible's folder // client.getCustomerResponsible() -// } + } email.setClient(client); }