--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/Database.java	2016/01/30 19:17:09	2884
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/Database.java	2016/02/03 18:45:33	2903
@@ -14,16 +14,16 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.logging.Logger;
 
 import dk.daoas.adressevedligehold.beans.Address;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 
 
 public class Database {	
-	Logger logger = Logger.getLogger(Database.class.getName());
+	private TaskLogger logger = TaskLogger.getInstance();
 
 	int batchCount = 0;
 
@@ -53,7 +53,7 @@
 	public Database(Connection conn)  throws SQLException,IOException {
 		this.conn = conn;
 
-		String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAddress,orgGadeid,orgHusnr,orgHusnrBogstav,orgRute,id,postnr,Address,gadeid,husnr,husnrbogstav,rute,afstand,`timestamp`) "+
+		String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,rute,afstand,`timestamp`) "+
 				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
 
 		saveStmt = conn.prepareStatement(sql);		
@@ -115,7 +115,7 @@
 		logger.info("Henter alle IKKE-daekkede Addressr");
 
 		String sql = "SELECT id,a.postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,ruteMa,p.distributor as ho " + 
-				"FROM fulddaekning.Addresstabel a " +
+				"FROM fulddaekning.adressetabel a " +
 				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 				"WHERE ruteMa IS NULL " +  //Ingen dækning
 				"AND a.postnr BETWEEN ? AND ? " +
@@ -178,7 +178,7 @@
 		
 		if ( alleAddressr == null ) {
 			String sql = "SELECT id,a.postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,ruteMa,p.distributor as ho " + 
-					"FROM fulddaekning.Addresstabel a " +
+					"FROM fulddaekning.adressetabel a " +
 					"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 					"WHERE ruteMa IS NOT NULL " + 
 					"AND latitude IS NOT NULL " +
@@ -298,8 +298,7 @@
 				list.add(adr);
 	
 				if (consts.doCheckHO() == true && adr.ho == 0) {
-					System.out.println( "Mangler HO" );
-					System.out.println( adr );
+					logger.info( "Mangler HO: " + adr );
 					throw new RuntimeException("Mangler HO: "+ adr);
 				}