--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceBK.java	2016/01/28 16:12:28	2868
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressSourceBK.java	2016/03/03 13:12:33	2964
@@ -1,18 +1,19 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.fileupload;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.util.List;
 
 import org.apache.commons.fileupload.FileItem;
 
-import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Splitter;
+
+import dk.daoas.adressevedligehold.fileupload.AddressSourceEntry.EntryType;
 import dk.daoas.adressevedligehold.util.SafeParsers;
 
 public class AddressSourceBK extends AbstractAddressSource {
 	
+	Splitter splitter = Splitter.on(';').trimResults( CharMatcher.is('"') );
 		
 	public AddressSourceBK(FileItem file) throws Exception {
 		super(file);
@@ -21,31 +22,9 @@
 	
 	@Override
 	public void validate() throws IOException {
-		try (		
-				InputStream is1 = file.getInputStream();
-				InputStreamReader isr1 = new InputStreamReader(is1, Charset.forName("ISO-8859-1") );
-				BufferedReader br1 = new BufferedReader(isr1)
-			) {
-			String line = br1.readLine();
-			
-			if (line == null) {
-				throw new IOException("Can't read 1st line - is file empty?");
-			}
-			
-			String[] parts = line.split(";");
-
-			if (parts.length != 13) {
-				throw new IOException("Not enough fields in CSV file. Found " + parts.length + ", expected 13");
-			}
-		}
-
-		
-		is = file.getInputStream();
-		isr = new InputStreamReader(is, Charset.forName("ISO-8859-1") );
-		br = new BufferedReader(isr);
+		super.validatNoHeaderLine(15, ';');
 	}
 
-	//TODO: Skal csv parsning klares med Apache Commons CSV ?
 
 	@Override
 	public AddressSourceEntry getNextEntry() throws IOException {
@@ -56,33 +35,34 @@
 		if (line.trim().equals(""))
 			return null;
 		
-		//System.out.println(line);
 		
 		AddressSourceEntry entry = new AddressSourceEntry( EntryType.TypeSingleAddress);
 		entry.distributor = "BK";
 		
-		String[] parts = line.split(";");
+		List<String> parts = splitter.splitToList(line);
 		
-		if (parts.length != 13) {
-			throw new IOException("Not enough fields in CSV file. Found " + parts.length + ", expected 13");
+		if (parts.size() != 15) {
+			throw new IOException("Wrong number of fields in CSV file. Found " + parts.size() + ", expected 15");
 		}
 		
-		entry.postnr = Short.parseShort( parts[0]);
-		entry.vejnavn = parts[1].replace("\"", "");
-		entry.husnr = Short.parseShort( parts[2] );
-		entry.litra = parts[3].replace("\"", "");
-		entry.vejkode = SafeParsers.parseShort( parts[4] );
-		entry.kommunekode = SafeParsers.parseShort( parts[5] );
-		entry.gadeid = Integer.parseInt( parts[6] );
-		
-		String ugedage = parts[7].replace("\"", "");
-		
-		String laesnr = parts[8].replace("\"", "");
-		
-		//String distnr = parts[9].replace("\"", ""); //Bruges ikke
-		String foede = parts[10].replace("\"", "");
-		String jobnr = parts[11].replace("\"", "");
-		String tklaes = parts[12].replace("\"", "");
+		entry.postnr = Short.parseShort( parts.get(0) );
+		entry.vejnavn = parts.get( 1 );
+		entry.husnr = Short.parseShort( parts.get( 2 ) );
+		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 );
+		
+		String laesnr = parts.get( 8 );
+		
+		//String distnr = parts.get( 9 ); //Bruges ikke
+		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;
@@ -118,4 +98,10 @@
 		return "BK";
 	}
 
+
+	@Override
+	public boolean calculateDistances() {
+		return true; //BK skal beregne afstande
+	}
+
 }