--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressSourceBK.java 2016/02/13 15:45:02 2947 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressSourceBK.java 2016/04/25 07:52:53 3016 @@ -22,10 +22,9 @@ @Override public void validate() throws IOException { - super.validatNoHeaderLine(14, ';'); + super.validatNoHeaderLine(15, ';'); } - //TODO: Skal csv parsning klares med Apache Commons CSV ? @Override public AddressSourceEntry getNextEntry() throws IOException { @@ -42,8 +41,8 @@ List parts = splitter.splitToList(line); - if (parts.size() != 14) { - throw new IOException("Not enough fields in CSV file. Found " + parts.size() + ", expected 14"); + if (parts.size() != 15) { + throw new IOException("Wrong number of fields in CSV file. Found " + parts.size() + ", expected 15"); } entry.postnr = Short.parseShort( parts.get(0) ); @@ -62,9 +61,11 @@ String foede = parts.get( 10 ); String jobnr = parts.get( 11 ); String tklaes = parts.get( 12 ); + //String pris = parts.get( 13 );//bruges ikke + //String blank = parts.get(14); //Bruges slet ikke - bk afslutter deres linier med en ; - entry.rute = laesnr; - entry.koreliste = "/" + foede + "/" + tklaes + "/" + jobnr; + entry.rute = jobnr; + entry.koreliste = laesnr + "/" + tklaes + "/" + foede ; // isv/tk/ entry.rute = dirigeringsCache.getInstance(entry.rute); entry.koreliste = dirigeringsCache.getInstance(entry.koreliste); @@ -97,4 +98,10 @@ return "BK"; } + + @Override + public boolean calculateDistances() { + return true; //BK skal beregne afstande + } + }