--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceBK.java	2016/01/28 10:30:01	2857
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceBK.java	2016/01/28 17:15:42	2874
@@ -1,60 +1,26 @@
 package dk.daoas.adressevedligehold;
 
-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 com.google.common.base.Splitter;
+
 import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
-import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.SafeParsers;
 
-public class AddressSourceBK implements AddressSource {
-	
-	DeduplicateHelper<String> dirigeringsCache = new DeduplicateHelper<String>();
-	
-	FileItem file;
+public class AddressSourceBK extends AbstractAddressSource {
 	
-	InputStream is;
-	InputStreamReader isr;
-	BufferedReader br;
-	
-	int lineCount = 0;
 		
 	public AddressSourceBK(FileItem file) throws Exception {
-		this.file = file;
-
-
-
+		super(file);
 	}
 
-	@Override
-	public String getFilename() {
-		return file.getName();
-	}
 	
 	@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();
-			String[] parts = line.split(";");
-			int numFields = parts.length;
-			if (numFields != 13) {
-				throw new IOException("Not enough fields in CSV file. Found " + numFields + ", expected 13");
-			}
-		}
-
-		
-		is = file.getInputStream();
-		isr = new InputStreamReader(is, Charset.forName("ISO-8859-1") );
-		br = new BufferedReader(isr);
+		super.validatNoHeaderLine(14, ';');
 	}
 
 	//TODO: Skal csv parsning klares med Apache Commons CSV ?
@@ -73,28 +39,28 @@
 		AddressSourceEntry entry = new AddressSourceEntry( EntryType.TypeSingleAddress);
 		entry.distributor = "BK";
 		
-		String[] parts = line.split(";");
+		List<String> parts =Splitter.on(';').splitToList(line);
 		
-		if (parts.length != 13) {
-			throw new IOException("Not enough fields in CSV file. Found " + parts.length + ", expected 13");
+		if (parts.size() != 14) {
+			throw new IOException("Not enough fields in CSV file. Found " + parts.size() + ", expected 14");
 		}
 		
-		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 ).replace("\"", "");
+		entry.husnr = Short.parseShort( parts.get( 2 ) );
+		entry.litra = parts.get( 3 ).replace("\"", "");
+		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 laesnr = parts.get( 8 ).replace("\"", "");
+		
+		//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("\"", "");
 		
 		entry.rute = laesnr;
 		entry.koreliste = "/" + foede + "/" + tklaes + "/" + jobnr;
@@ -130,21 +96,4 @@
 		return "BK";
 	}
 
-	@Override //AutoCloseable
-	public void close() throws Exception {
-		System.out.println("Closing BK after lines " + lineCount);
-		try {
-			br.close();
-			isr.close();
-			is.close();
-
-			file.delete();
-			
-		} catch (Exception e) {
-			System.out.println("Error on closing " + e.getMessage() );
-		}
-		
-		
-	}
-
 }