--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/09/20 11:15:58	2223
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/10/08 08:44:56	2231
@@ -52,7 +52,9 @@
 		conn.createStatement().executeUpdate(sql);
 		
 		logger.info("Rename tables");
-		sql = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old " + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext;
+		sql = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext;
+
+		logger.info("Executing: " + sql);
 		conn.createStatement().executeUpdate(sql);		
 	}	
 
@@ -83,10 +85,11 @@
 	public Queue<Adresse> hentIkkedaekkedeAdresser(int postnr)  throws SQLException {
 		ConcurrentLinkedQueue<Adresse> queue = new ConcurrentLinkedQueue<Adresse>();
 
-		String sql = "SELECT id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute " + 
-				"FROM fulddaekning.adressetabel " +
+		String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
+				"FROM fulddaekning.adressetabel a " +
+				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 				"WHERE rute IS NULL " +  //Ingen dækning
-				"AND postnr=?  " +
+				"AND a.postnr=?  " +
 				"AND latitude IS NOT NULL " +
 				"AND longitude IS NOT NULL " +
 				"AND gadeid IS NOT NULL ";
@@ -128,12 +131,13 @@
 	}
 
 	public Adresse[] hentDaekkedeAdresser( BoundingBox bbox) throws SQLException {
-		String sql = "SELECT id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute " + 
-				"FROM fulddaekning.adressetabel " +
+		String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
+				"FROM fulddaekning.adressetabel a " +
+				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 				"WHERE rute IS NOT NULL " + 
 				"AND latitude BETWEEN ? AND ? " +
 				"AND longitude BETWEEN ? AND ? " +
-				"AND distributor = ? ";
+				"AND a.distributor = ? ";
 
 		// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
 		// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html 
@@ -149,9 +153,31 @@
 
 		List<Adresse> list = hentAdresseListe( stmt );
 		return list.toArray( new Adresse[ list.size() ] );
-
 	}
+	
+	
+	public Adresse[] hentAlleDaekkedeAdresser() throws SQLException {
+		String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
+				"FROM fulddaekning.adressetabel a " +
+				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
+				"WHERE rute IS NOT NULL " + 
+				"AND latitude IS NOT NULL " +
+				"AND longitude IS NOT NULL " +
+				"AND a.distributor = ? ";
 
+		// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
+		// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html 
+		//PreparedStatement stmt = conn.prepareStatement(sql);
+		PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+		stmt.setFetchSize(Integer.MIN_VALUE);
+
+		stmt.setString(1, Lookup.distributor);
+
+		List<Adresse> list = hentAdresseListe( stmt );
+		return list.toArray( new Adresse[ list.size() ] );
+	}
+	
+	
 
 	public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
 		/*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
@@ -219,6 +245,7 @@
 			adr.latitude = res.getDouble("latitude");
 			adr.longitude = res.getDouble("longitude");
 			adr.rute = res.getString("rute");
+			adr.ho = res.getInt("ho");
 
 			list.add(adr);