--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/09/12 21:03:06	2219
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/12/09 15:49:43	2237
@@ -44,12 +44,17 @@
 	}	
 	
 	public void renameResultTables() throws SQLException {
+		Constants consts = Constants.getInstance();
+		String ext = consts.getTableExtension();
+		
 		logger.info("Dropping old backup table (if exists)");
-		String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old";
+		String sql = "DROP TABLE IF EXISTS fulddaekning.afstand_anden_rute_old" + ext;
 		conn.createStatement().executeUpdate(sql);
 		
 		logger.info("Rename tables");
-		sql = "RENAME TABLE fulddaekning.afstand_anden_rute TO fulddaekning.afstand_anden_rute_old, fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute";
+		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);		
 	}	
 
@@ -80,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);
 
@@ -102,8 +109,8 @@
 
 		String sql = "SELECT postnr " + 
 					 "FROM fulddaekning.adressetabel " + 
-					 //"WHERE distributor = ? and rute is not null " +
 					 "WHERE postnr BETWEEN ? AND ? " +
+					 "AND rute is null " + // Træk kun liste på postnumre hvor der er ikke-dækkede adresser
 					 "GROUP BY postnr " + 
 					 "ORDER by postnr";
 		PreparedStatement stmt = conn.prepareStatement(sql);
@@ -125,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 
@@ -146,9 +154,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`) "+
@@ -216,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);
 
@@ -242,8 +273,7 @@
 	    connectionProps.put("user", db_user);
 	    connectionProps.put("password", db_pass);
 
-
-	    
+	    //For debug output, tilføj denne til JDBC url'en: &profileSQL=true	    
 	    conn = DriverManager.getConnection(
 	                   "jdbc:mysql://" +
 	                   db_host +