--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceBK.java 2016/01/28 17:15:42 2874 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceBK.java 2016/01/28 17:54:20 2875 @@ -5,6 +5,7 @@ import org.apache.commons.fileupload.FileItem; +import com.google.common.base.CharMatcher; import com.google.common.base.Splitter; import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType; @@ -12,6 +13,7 @@ public class AddressSourceBK extends AbstractAddressSource { + Splitter splitter = Splitter.on(';').trimResults( CharMatcher.is('"') ); public AddressSourceBK(FileItem file) throws Exception { super(file); @@ -39,28 +41,28 @@ AddressSourceEntry entry = new AddressSourceEntry( EntryType.TypeSingleAddress); entry.distributor = "BK"; - List parts =Splitter.on(';').splitToList(line); + List parts = splitter.splitToList(line); if (parts.size() != 14) { throw new IOException("Not enough fields in CSV file. Found " + parts.size() + ", expected 14"); } entry.postnr = Short.parseShort( parts.get(0) ); - entry.vejnavn = parts.get( 1 ).replace("\"", ""); + entry.vejnavn = parts.get( 1 ); entry.husnr = Short.parseShort( parts.get( 2 ) ); - entry.litra = parts.get( 3 ).replace("\"", ""); + entry.litra = parts.get( 3 ); entry.vejkode = SafeParsers.parseShort( parts.get( 4) ); entry.kommunekode = SafeParsers.parseShort( parts.get( 5) ); entry.gadeid = Integer.parseInt( parts.get( 6 ) ); - String ugedage = parts.get( 7 ).replace("\"", ""); + String ugedage = parts.get( 7 ); - String laesnr = parts.get( 8 ).replace("\"", ""); + String laesnr = parts.get( 8 ); - //String distnr = parts.get( 9 ).replace("\"", ""); //Bruges ikke - String foede = parts.get( 10 ).replace("\"", ""); - String jobnr = parts.get( 11 ).replace("\"", ""); - String tklaes = parts.get( 12 ).replace("\"", ""); + //String distnr = parts.get( 9 ); //Bruges ikke + String foede = parts.get( 10 ); + String jobnr = parts.get( 11 ); + String tklaes = parts.get( 12 ); entry.rute = laesnr; entry.koreliste = "/" + foede + "/" + tklaes + "/" + jobnr;