--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/05/07 07:39:26	2150
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/05/07 07:59:03	2151
@@ -13,48 +13,55 @@
 
 public class Database {	
 	Logger logger = Logger.getLogger(Database.class.getName());
-	
-	
+
+
 	Connection conn;
 	PreparedStatement saveStmt;
 
 	public Database(Connection conn)  throws SQLException {
 		this.conn = conn;				
-		
+
 		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`) "+
-		"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
+				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
 
 		saveStmt = conn.prepareStatement(sql);		
-		
+
 	}
-	
+
+	public void resetResultTable() throws SQLException {
+		logger.info("Truncating result table");
+		String sql = "TRUNCATE TABLE fulddaekning.afstand_anden_rute_thn";
+		conn.createStatement().executeUpdate(sql);
+
+	}	
+
 	public BoundingBox getBoundingbox(int postnr) throws SQLException {
-		
+
 		String sql = 
 				"select max(latitude) latmax, min(latitude) latmin, max(longitude) lngmax,min(longitude) lngmin  " + 
-				"from fulddaekning.adressetabel WHERE postnr=? and rute is null;";
-		
+						"from fulddaekning.adressetabel WHERE postnr=? and rute is null;";
+
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		stmt.setInt(1, postnr);
-		
+
 		ResultSet res = stmt.executeQuery();
 		res.next(); //query returnerer altid 1 række
-		
+
 		BoundingBox bbox = new BoundingBox();
 		bbox.latitudeMax = res.getDouble("latmax");
 		bbox.latitudeMin = res.getDouble("latmin");
 		bbox.longitudeMax = res.getDouble("lngmax");
 		bbox.longitudeMin = res.getDouble("lngmin");
-		
+
 		res.close();
 		stmt.close();
-		
+
 		return bbox;
 	}
-	
+
 	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 " +
 				"WHERE rute IS NULL " +  //Ingen dækning
 				"AND postnr=?  " +
@@ -63,60 +70,60 @@
 				"AND gadeid IS NOT NULL ";
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		stmt.setInt(1, postnr);
-		
+
 		queue.addAll( hentAdresseListe( stmt ) );
 		return queue;
 	}
-	
+
 	public List<Integer> hentPostnumre() throws SQLException {
 		ArrayList<Integer> list = new ArrayList<Integer>();
-		
-		
+
+
 		String sql = "SELECT postnr FROM fulddaekning.adressetabel WHERE distributor = 'DAO' and rute is not null GROUP BY postnr ORDER by postnr";
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		ResultSet res = stmt.executeQuery();
-		
+
 		while (res.next()) {
 			int postnr = res.getInt("postnr");
 			list.add(postnr);
 		}
 		res.close();
 		stmt.close();
-		
+
 		//list.add(8700);
-		
+
 		return list;
 	}
-	
+
 	public ArrayList<Adresse> hentDaekkedeAdresser( BoundingBox bbox) throws SQLException {
 		String sql = "SELECT id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute FROM fulddaekning.adressetabel " +
 				"WHERE rute IS NOT NULL " + 
 				"AND latitude BETWEEN ? AND ? " +
 				"AND longitude BETWEEN ? AND ? " +
 				"AND distributor = 'DAO' ";
-		
+
 		// 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.setDouble(1, bbox.latitudeMin);
 		stmt.setDouble(2, bbox.latitudeMax);
 		stmt.setDouble(3, bbox.longitudeMin);
 		stmt.setDouble(4, bbox.longitudeMax);
-		
+
 		return hentAdresseListe( stmt );
-		
+
 	}
 
-	
+
 	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`) "+
 				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
-		
+
 		PreparedStatement saveStmt = conn.prepareStatement(sql);*/
-		
+
 		saveStmt.setInt(1, orgAdresse.id);
 		saveStmt.setInt(2, orgAdresse.postnr);
 		saveStmt.setString(3, orgAdresse.adresse);
@@ -126,8 +133,8 @@
 		saveStmt.setDouble(7, orgAdresse.latitude);
 		saveStmt.setDouble(8, orgAdresse.longitude);
 		saveStmt.setString(9, orgAdresse.rute);
-		
-		
+
+
 		saveStmt.setInt(10, bedsteAdresse.id);
 		saveStmt.setInt(11, bedsteAdresse.postnr);
 		saveStmt.setString(12, bedsteAdresse.adresse);
@@ -137,26 +144,26 @@
 		saveStmt.setDouble(16, bedsteAdresse.latitude);
 		saveStmt.setDouble(17, bedsteAdresse.longitude);
 		saveStmt.setString(18, bedsteAdresse.rute);
-		
+
 		saveStmt.setDouble(19, bedsteAfstand);
-		
+
 		saveStmt.executeUpdate();	
 		saveStmt.clearParameters();
-		
-		
+
+
 		//saveStmt.close();	
-		
+
 	}
-	
-		
-	
+
+
+
 	protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
 		ArrayList<Adresse> list = new ArrayList<Adresse>( 30000 );
-		
+
 		//logger.info("Starting query");
 		ResultSet res = stmt.executeQuery();
 		//logger.info("Starting exec query done");
-		
+
 		while (res.next()) {
 			Adresse adr = new Adresse();
 			adr.id = res.getInt("id");
@@ -168,18 +175,18 @@
 			adr.latitude = res.getDouble("latitude");
 			adr.longitude = res.getDouble("longitude");
 			adr.rute = res.getString("rute");
-			
+
 			list.add(adr);
-			
+
 			//logger.info( "Adress:" + adr);
 		}
-				
+
 		res.close();
 		stmt.close();
-		
+
 		return list;
 	}
 
-	
+
 
 }