--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/db/DatabaseLayerImplementation.java	2016/01/26 08:21:22	2845
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/db/DatabaseLayerImplementation.java	2016/02/12 22:30:30	2937
@@ -8,7 +8,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+
+
 import dk.daoas.adressevedligehold.beans.Address;
+import dk.daoas.adressevedligehold.beans.Address.AddressState;
+import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
@@ -20,23 +24,25 @@
 
 public class DatabaseLayerImplementation  {
 	
-	static boolean DEBUG = false;
+	//static boolean DEBUG = false;
+	
+	private TaskLogger logger = TaskLogger.getInstance();
 	
 	
 	public List<Address> getAllAdresses() throws SQLException {
 		TimingHelper timing = new TimingHelper();
 		
-		String debugFilter = DatabaseLayerImplementation.DEBUG ? " WHERE postnr >= 6000 " : "";
+		//String debugFilter = DatabaseLayerImplementation.DEBUG ? " WHERE postnr >= 6000 " : "";
 		
 		String sql = 
 				"SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,latitude,longitude, "
 				+ "rutema,korelistema,ruteti,korelisteti,ruteon,korelisteon,ruteto,korelisteto,rutefr,korelistefr,rutelo,korelistelo,ruteso,korelisteso "
 				+ "FROM fulddaekning.adressetabel "
-				+ debugFilter
+				//+ debugFilter
 				;
 		
 		try ( Connection conn = DBConnection.getConnection();		
-				Statement stmt = conn.createStatement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
+				Statement stmt = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY);
 				) {
 			stmt.setFetchSize(Integer.MIN_VALUE);
 			ResultSet res = stmt.executeQuery(sql);
@@ -92,18 +98,74 @@
 			res.close();
 			
 			
-			System.out.println("DB Loaded " + list.size() + " adresses in " + timing.getElapsed() + "ms");
+			logger.info("DB Loaded " + list.size() + " adresses in " + timing.getElapsed() + "ms");
 			
 			return list;
 		}
 	}
 	
-	private void updateAddressesBatch(List<Address> addresses)  throws SQLException {
+	public void saveNewAddresses(List<Address> addresses) {
+		logger.info("DB::saveNewAddresses size:" + addresses.size() );
+		
+		String sql = "INSERT IGNORE INTO fulddaekning.adressetabel " +
+					 "(vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,dbkbane,indlast,aendret,david,googlechecked," +
+					 "RuteMa,KorelisteMa,RuteTi,KorelisteTi,RuteOn,KorelisteOn,RuteTo,KorelisteTo,RuteFr,KorelisteFr,RuteLo,KorelisteLo,RuteSo,KorelisteSo) " +
+					 "VALUES " +
+					 "(?,?,?,?,?,?,?,?, now(), now(), ?, 0, " +
+					 "?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 		
+		
+		try (Connection con = DBConnection.getConnection()) {
+			//con.setAutoCommit(false);
+			
+			try (PreparedStatement stmt = con.prepareStatement(sql)) {
+				for (Address addr : addresses) {
+					
+					String david = String.format("%04d%03d%04d", addr.postnr, addr.kommunekode, addr.vejkode);
+					
+					stmt.setString(1, addr.vejnavn);
+					stmt.setShort(2, addr.husnr);
+					stmt.setString(3, addr.husnrbogstav);
+					stmt.setShort(4, addr.kommunekode);
+					stmt.setShort(5, addr.vejkode);
+					stmt.setShort(6, addr.postnr);
+					stmt.setInt(7, addr.gadeid);
+					stmt.setShort(8, addr.dbkBane);
+					stmt.setString(9, david);
+					
+					stmt.setString(10, addr.ruteMandag);
+					stmt.setString(11, addr.korelisteMandag);
+					stmt.setString(12, addr.ruteTirsdag);
+					stmt.setString(13, addr.korelisteTirsdag);
+					stmt.setString(14, addr.ruteOnsdag);
+					stmt.setString(15, addr.korelisteOnsdag);
+					stmt.setString(16, addr.ruteTorsdag);
+					stmt.setString(17, addr.korelisteTorsdag);
+					stmt.setString(18, addr.ruteFredag);
+					stmt.setString(19, addr.korelisteFredag);
+					stmt.setString(20, addr.ruteLordag);
+					stmt.setString(21, addr.korelisteLordag);
+					stmt.setString(22, addr.ruteSondag);
+					stmt.setString(23, addr.korelisteSondag);
+
+					
+					stmt.execute();
+					if (stmt.getUpdateCount() != 1) {
+						logger.info("Error executing insert: " + addr);
+						addr.state = AddressState.CREATE_FAIL;
+					}
+					
+				}
+			}
+			
+			//con.commit();
+		} catch (SQLException e) {
+			logger.warning("Error inserting addresses", e  );
+		}
 	}
 	
 	public void updateAddresses(List<Address> addresses) {
-		System.out.println("DB::UpdateAddresses size:" + addresses.size() );
+		logger.info("DB::UpdateAddresses size:" + addresses.size() );
 		
 		String sql = "UPDATE fulddaekning.adressetabel " +
 					"SET " +
@@ -114,8 +176,10 @@
 					"RuteFr=?, KorelisteFr=?, " +
 					"RuteLo=?, KorelisteLo=?, " +
 					"RuteSo=?, KorelisteSo=?, " +
-				    "Distributor=? " +
-					"WHERE id=?";
+				    "Distributor=?, " +
+				    "DBKBane=?, " +
+				    "Aendret=now() " +
+					"WHERE id=? ";
 					
 					
 		
@@ -140,12 +204,13 @@
 					stmt.setString(14, addr.korelisteSondag);
 
 					stmt.setString(15, addr.distributor);
-					stmt.setInt(16, addr.id);
+					stmt.setInt(16, addr.dbkBane);
+					stmt.setInt(17, addr.id);
 
 					
 					stmt.execute();
 					if (stmt.getUpdateCount() != 1) {
-						System.out.println("Error executing update");
+						logger.warning("Error executing update: " + addr);
 					}
 					
 				}
@@ -153,10 +218,11 @@
 			
 			//con.commit();
 		} catch (SQLException e) {
-			System.out.println("Error updating addresses" + e.getMessage() );
+			logger.warning("Error updating addresses", e );
 		}
 	}
 	
+	/*
 	private static String nullify(String str) {
 		if (str == null)
 			return null;