--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/Database.java	2016/02/12 22:30:30	2937
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/DatabaseRouteDistance.java	2016/03/08 09:41:53	2972
@@ -22,7 +22,7 @@
 
 
 
-public class Database {	
+public class DatabaseRouteDistance {	
 	private TaskLogger logger = TaskLogger.getInstance();
 
 	int batchCount = 0;
@@ -35,6 +35,8 @@
 	
 	Map<Short,List<Address>> daekkedeAddressrHO = new HashMap<Short,List<Address>>();
 	
+	String weekdayField;
+	
 	
 	
 	
@@ -51,15 +53,17 @@
 	
 	private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>();
 
-	public Database(Connection conn, boolean isIncremental)  throws SQLException,IOException {
+	public DatabaseRouteDistance(Connection conn, boolean isIncremental, String weekdayField) throws SQLException,IOException {
 		this.conn = conn;
 		
 		String newExt = "";
 		if (isIncremental == false) {
 			newExt = "_ny";
 		}
+		
+		this.weekdayField = weekdayField;
 
-		String sql = "INSERT INTO fulddaekning.afstand_anden_rute" + newExt + " (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,rute,afstand,`timestamp`) "+
+		String sql = "INSERT IGNORE INTO fulddaekning.afstand_anden_rute" + newExt + " (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,rute,afstand,`timestamp`) "+
 				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
 
 		saveStmt = conn.prepareStatement(sql);		
@@ -137,7 +141,7 @@
 				"FROM fulddaekning.adressetabel a " +
 				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 				placeHolder1 +
-				"WHERE ruteMa IS NULL " +  //Ingen dækning
+				"WHERE " + weekdayField +  " IS NULL " +  //Ingen dækning
 				"AND a.postnr BETWEEN ? AND ? " +
 				"AND latitude IS NOT NULL " +
 				"AND longitude IS NOT NULL " +
@@ -211,7 +215,7 @@
 			String sql = "SELECT id,a.postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,ruteMa,p.distributor as ho " + 
 					"FROM fulddaekning.adressetabel a " +
 					"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
-					"WHERE ruteMa IS NOT NULL " + 
+					"WHERE " + weekdayField +  " IS NOT NULL " + 
 					"AND latitude IS NOT NULL " +
 					"AND longitude IS NOT NULL " +
 					"AND a.distributor = ? ";
@@ -305,7 +309,7 @@
 		String sql1 = "UPDATE fulddaekning.afstand_anden_rute" + consts.getTableExtension() + " afstand " +
 					 "JOIN fulddaekning.adressetabel addr ON (afstand.id = addr.id) " + 
 					 "SET afstand.id = 0 " +
-					 "WHERE addr.rutema is null "
+					 "WHERE ruteMa is null "
 					 ;
 		
 		String sql2 = "DELETE FROM fulddaekning.afstand_anden_rute" + consts.getTableExtension() + " " +