Author: echatellier Date: 2014-07-16 18:15:28 +0200 (Wed, 16 Jul 2014) New Revision: 402 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/402 Log: Mise ?\195?\160 jour des clients qui existe d?\195?\169j?\195?\160 Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-16 15:44:06 UTC (rev 401) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/imports/ClientImportModel.java 2014-07-16 16:15:28 UTC (rev 402) @@ -26,6 +26,8 @@ import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.ClientImpl; + +import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; @@ -49,13 +51,28 @@ return s; } }; + + // parser qui retire les non nombres des numero de fax + ValueParser<String> faxParser = new ValueParser<String>() { + @Override + public String parse(String s) throws ParseException { + if ("NULL".equals(s)) { + s = null; + } + if (s != null) { + s = StringUtils.removePattern(s, "[^0-9]"); + } + return s; + } + }; + newMandatoryColumn("Id_Correspondance", Client.PROPERTY_ID); newMandatoryColumn("Societe", Client.PROPERTY_BRAND); newMandatoryColumn("Nom", Client.PROPERTY_NAME); newMandatoryColumn("Caracteristique1", Client.PROPERTY_CARACTERISTIC1, nullParser); newMandatoryColumn("Caracteristique2", Client.PROPERTY_CARACTERISTIC2, nullParser); newMandatoryColumn("Caracteristique3", Client.PROPERTY_CARACTERISTIC3, nullParser); - newMandatoryColumn("Numero_Fax", Client.PROPERTY_FAX_NUMBER, nullParser); + newMandatoryColumn("Numero_Fax", Client.PROPERTY_FAX_NUMBER, faxParser); newMandatoryColumn("Adresse_Mail", Client.PROPERTY_EMAIL_ADDRESS, nullParser); newMandatoryColumn("Code_Client", Client.PROPERTY_CODE);