--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/09/29 18:15:48	2230
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/11/11 13:45:21	2235
@@ -85,13 +85,15 @@
 	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 ";
+				"AND gadeid IS NOT NULL " +
+				"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";		
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		stmt.setInt(1, postnr);
 
@@ -130,12 +132,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 
@@ -155,12 +158,13 @@
 	
 	
 	public Adresse[] hentAlleDaekkedeAdresser() 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 IS NOT NULL " +
 				"AND longitude IS NOT NULL " +
-				"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 
@@ -242,6 +246,7 @@
 			adr.latitude = res.getDouble("latitude");
 			adr.longitude = res.getDouble("longitude");
 			adr.rute = res.getString("rute");
+			adr.ho = res.getInt("ho");
 
 			list.add(adr);