--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java 2014/05/07 07:59:03 2151 +++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java 2014/05/07 08:10:45 2152 @@ -1,11 +1,14 @@ package dk.daoas.fulddaekning; +import java.io.IOException; import java.sql.Connection; +import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; +import java.util.Properties; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.logging.Logger; @@ -18,8 +21,8 @@ Connection conn; PreparedStatement saveStmt; - public Database(Connection conn) throws SQLException { - this.conn = conn; + public Database(Properties conf) throws SQLException,IOException { + this.conn = getConnection( conf ); 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() )"; @@ -187,6 +190,27 @@ return list; } - + public Connection getConnection(Properties conf) throws SQLException, IOException { + + String db_host = conf.getProperty("DB_HOST"); + String db_user = conf.getProperty("DB_USER"); + String db_pass = conf.getProperty("DB_PASS"); + + + + + Connection conn = null; + Properties connectionProps = new Properties(); + connectionProps.put("user", db_user); + connectionProps.put("password", db_pass); + + conn = DriverManager.getConnection( + "jdbc:mysql://" + + db_host + + ":3306/", + connectionProps); + logger.info("Connected to database"); + return conn; + } }