--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/09/11 14:46:59	2203
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/09/20 11:16:56	2224
@@ -14,9 +14,11 @@
 import java.util.logging.Logger;
 
 
+
 public class Database {	
 	Logger logger = Logger.getLogger(Database.class.getName());
 
+	int batchCount = 0;
 
 	Connection conn;
 	PreparedStatement saveStmt;
@@ -42,12 +44,15 @@
 	}	
 	
 	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;
 		conn.createStatement().executeUpdate(sql);		
 	}	
 
@@ -122,7 +127,7 @@
 		return list;
 	}
 
-	public ArrayList<Adresse> hentDaekkedeAdresser( BoundingBox bbox) throws SQLException {
+	public 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 " + 
@@ -142,7 +147,8 @@
 		stmt.setDouble(4, bbox.longitudeMax);
 		stmt.setString(5, Lookup.distributor);
 
-		return hentAdresseListe( stmt );
+		List<Adresse> list = hentAdresseListe( stmt );
+		return list.toArray( new Adresse[ list.size() ] );
 
 	}
 
@@ -176,18 +182,27 @@
 
 		saveStmt.setDouble(19, bedsteAfstand);
 
-		saveStmt.executeUpdate();	
-		saveStmt.clearParameters();
-
+		saveStmt.addBatch();
+		batchCount++;
+		if (batchCount >= 100) {
+			saveStmt.executeBatch();
+			batchCount = 0;
+		}
+		//saveStmt.executeUpdate();	
+		//saveStmt.clearParameters();
 
 		//saveStmt.close();	
-
+	}
+	
+	public synchronized void saveBatch() throws SQLException{
+		saveStmt.executeBatch();
+		batchCount = 0;
 	}
 
 
 
 	protected ArrayList<Adresse> hentAdresseListe(PreparedStatement stmt) throws SQLException{
-		ArrayList<Adresse> list = new ArrayList<Adresse>( 30000 );
+		ArrayList<Adresse> list = new ArrayList<Adresse>( 1000000 );
 
 		//logger.info("Starting query");
 		ResultSet res = stmt.executeQuery();
@@ -230,10 +245,11 @@
 	    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 +
-	                   ":3306/",
+	                   ":3306/?rewriteBatchedStatements=true",
 	                   connectionProps);
 	    logger.info("Connected to database");
 	    return conn;