Author: dcosse Date: 2014-06-20 18:23:59 +0200 (Fri, 20 Jun 2014) New Revision: 248 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/248 Log: correction sur filtre reception mails Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-20 16:21:36 UTC (rev 247) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-06-20 16:23:59 UTC (rev 248) @@ -145,7 +145,7 @@ AttachmentFileTopiaDao attachementFileTopiaDao = getPersistenceContext().getAttachmentFileDao(); for (Attachment attachment : attachments) { - // get attchment BEFORE for flush + // get attachment BEFORE for flush AttachmentFile originalFile = null; AttachmentFile editedFile = null; if (attachment.isPersisted()) { 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-20 16:21:36 UTC (rev 247) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-06-20 16:23:59 UTC (rev 248) @@ -190,7 +190,9 @@ int count = folder.getMessageCount(); int unread = folder.getUnreadMessageCount(); - log.debug(count + " messages, " + unread + " unread"); + if (log.isDebugEnabled()) { + log.debug(count + " messages, " + unread + " unread"); + } EmailService emailService = serviceContext.newService(EmailService.class); MailFolderService mailFolderService = serviceContext.newService(MailFolderService.class); @@ -205,7 +207,10 @@ List<String> modifiedProperties = new ArrayList<>(); -// log.debug("Object: " + message.getSubject()); + if (log.isDebugEnabled()){ + log.debug("Object: " + message.getSubject()); + } + // email.s(message.getSubject()); // modifiedProperties.add(Email.PROPERTY_OBJECT); @@ -220,11 +225,19 @@ } for (Address address : recipients) { + String recipient = address.toString(); + + // some reciepient are like "toto tutu<toto.tutu73@gmail.com>" + // the regex is to extract email address from it + recipient = recipient.replaceFirst("^.*<(.*)>$", "$1"); + MailFolder mailFolder = mailFolderService.getFolderForRecipient(recipient); if (mailFolder != null) { - log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); + if (log.isDebugEnabled()){ + log.debug("\tTo : " + address + " -> " + (mailFolder != null ? mailFolder.getName() : "none")); + } email.setRecipient(recipient); email.setMailFolder(mailFolder); @@ -317,7 +330,9 @@ message.setFlag(Flags.Flag.DELETED, true); } } - log.debug("End of emails"); + if (log.isDebugEnabled()){ + log.debug("End of emails"); + } } catch (Exception e) { log.error("Error while reading the emails", e);