--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/db/DatabaseCoverageUpdate.java 2016/02/16 09:38:13 2949 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/db/DatabaseCoverageUpdate.java 2016/04/19 12:36:31 3003 @@ -16,8 +16,7 @@ import dk.daoas.adressevedligehold.util.DeduplicateHelper; import dk.daoas.adressevedligehold.util.TimingHelper; -/* - * TODO: Batched skrivning af updates +/* * */ @@ -108,14 +107,16 @@ 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) " + + "RuteMa,KorelisteMa,RuteTi,KorelisteTi,RuteOn,KorelisteOn,RuteTo,KorelisteTo,RuteFr,KorelisteFr,RuteLo,KorelisteLo,RuteSo,KorelisteSo, " + + "kommentar,latitude,longitude) " + "VALUES " + "(?,?,?,?,?,?,?,?, now(), now(), ?, 0, " + - "?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + "?,?,?,?,?,?,?,?,?,?,?,?,?,?," + + "?,?,?) "; try (Connection con = DBConnection.getConnection()) { - //con.setAutoCommit(false); + try (PreparedStatement stmt = con.prepareStatement(sql)) { for (Address addr : addresses) { @@ -146,6 +147,19 @@ stmt.setString(21, addr.korelisteLordag); stmt.setString(22, addr.ruteSondag); stmt.setString(23, addr.korelisteSondag); + + stmt.setString(24, addr.kommentar); + + if (addr.latitude != 0.0) { + stmt.setDouble(25, addr.latitude); + } else { + stmt.setNull(25, java.sql.Types.DOUBLE); + } + if (addr.longitude != 0.0) { + stmt.setDouble(26, addr.longitude); + } else { + stmt.setNull(26, java.sql.Types.DOUBLE); + } stmt.execute();